commit 92caa89837f5ffa4085fb6d8014f5e6c07067eb4
author Ray Essick <essick@google.com> Sat May 30 01:26:17 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat May 30 01:26:17 2020 +0000
tree 2dafc820d4701b6627054cced0bcee2342dcdedc
parent decb72d59ab559f8e3919f5400d321eae42da6ad
parent ac044457bc39b3379a1b0f7f74e12b43d92d3b13

Merge "decoder: Returned frame_decoded true after decoding both fields" into rvc-dev am: 7cdf266cda am: ac044457bc

Change-Id: Ic3faf706214bf4718fa7b1030110d3efe18f0c00

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)
         {