commit 3f65df7ef91c78d677be4cedd6fd14a22cb9ef78
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Fri Jun 05 22:03:45 2020 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Fri Jun 05 22:03:45 2020 +0000
tree 2dafc820d4701b6627054cced0bcee2342dcdedc
parent 2ff9225ce0db5c0cc855e0fa7bd73b11aa4b12ca
parent 011b6eba48d395504aad4bd7b8e3f52b3c53b54d

Snap for 6563627 from 011b6eba48d395504aad4bd7b8e3f52b3c53b54d to r-keystone-qcom-release

Change-Id: I278031439d0325ca150b7b70954ddea179f2d99a

PREUPLOAD.cfg

diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 86b6de3..ecf8b8e 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,2 +1,2 @@
 [Hook Scripts]
-mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook.sh
+mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook_project.sh

decoder/impeg2d_pic_proc.c

diff --git a/decoder/impeg2d_pic_proc.c b/decoder/impeg2d_pic_proc.c
index 332ab0f..ac29f9b 100644
--- a/decoder/impeg2d_pic_proc.c
+++ b/decoder/impeg2d_pic_proc.c
@@ -375,13 +375,17 @@
             if(ps_dec->u4_deinterlace)
                 impeg2_buf_mgr_set_status((buf_mgr_t *)ps_dec->pv_pic_buf_mg, ps_dec->i4_cur_buf_id, MPEG2_BUF_MGR_DEINT);
 
-            ps_pic_buf->u4_ts = ps_dec->u4_inp_ts;
             ps_pic_buf->e_pic_type = ps_dec->e_pic_type;
             ps_dec->ps_cur_pic = ps_pic_buf;
             ps_dec->s_cur_frm_buf.pu1_y = ps_pic_buf->pu1_y;
             ps_dec->s_cur_frm_buf.pu1_u = ps_pic_buf->pu1_u;
             ps_dec->s_cur_frm_buf.pu1_v = ps_pic_buf->pu1_v;
         }
+        else
+        {
+            /* Timestamp associated with second field is associated with the current picture */
+            ps_dec->ps_cur_pic->u4_ts = ps_dec->u4_inp_ts;
+        }
 
         if(ps_dec->u2_picture_structure == TOP_FIELD)
         {