commit 28202cea785b894c5c2b9d1754604900a8628759
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Thu Aug 15 16:11:52 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 15 16:11:52 2019 -0700
tree fd046d1c3915198b0f6824c22996dad56654376a
parent b2106ebcbe031b0754cf35f7ce27e9ebfe88d330
parent 2461f041dafa7aebbfece8f115dfd4326a09ef33

Merge "Added avc_dec_fuzzer" am: 219459dcb3 am: 6b7b0ac4ee am: 6cfc9cfe9c am: 808d34180a
am: 2461f041da

Change-Id: I9cc7972be34abb671bebe9597e8fe79a9bc9d369

decoder/ih264d_parse_slice.c

diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c
index 8d50f9a..1f80912 100644
--- a/decoder/ih264d_parse_slice.c
+++ b/decoder/ih264d_parse_slice.c
@@ -835,12 +835,7 @@
             if(ret != OK)
                 return ret;
 
-            {
-                ivd_video_decode_op_t * ps_dec_output =
-                                (ivd_video_decode_op_t *)ps_dec->pv_dec_out;
 
-                ps_dec_output->u4_frame_decoded_flag = 1;
-            }
             if(ps_dec->au1_pic_buf_ref_flag[ps_dec->u1_pic_buf_id] == 0)
             {
                 ih264_buf_mgr_release((buf_mgr_t *)ps_dec->pv_mv_buf_mgr,
@@ -861,6 +856,11 @@
                         || ((TOP_FIELD_ONLY | BOT_FIELD_ONLY)
                                         == ps_dec->u1_top_bottom_decoded))
         {
+            ivd_video_decode_op_t * ps_dec_output =
+                            (ivd_video_decode_op_t *)ps_dec->pv_dec_out;
+            /* u4_frame_decoded_flag is set to 1 only after both fields
+             * are decoded or it is not a field */
+            ps_dec_output->u4_frame_decoded_flag = 1;
             if(IVD_DECODE_FRAME_OUT == ps_dec->e_frm_out_mode)
             {
                 ret = ih264d_assign_display_seq(ps_dec);