summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Mahendrakar <harish.mahendrakar@ittiam.com>2016-06-01 13:31:45 +0530
committerMarco Nelissen <marcone@google.com>2016-06-09 08:31:55 -0700
commit5e4f64c0748095266e48f7f6663d9ce59738ad83 (patch)
tree49f329f5e924681950f5ae2ab4cf5fdf226a51ad
parent37579218eb5261d59c36fcc741b11155894dddd7 (diff)
downloadandroid_external_libavc-5e4f64c0748095266e48f7f6663d9ce59738ad83.tar.gz
android_external_libavc-5e4f64c0748095266e48f7f6663d9ce59738ad83.tar.bz2
android_external_libavc-5e4f64c0748095266e48f7f6663d9ce59738ad83.zip
Decoder: Fix slice number increment for error clips
Bug: 28673410
-rw-r--r--decoder/ih264d_api.c1
-rw-r--r--decoder/ih264d_parse_headers.c6
-rw-r--r--decoder/ih264d_parse_pslice.c5
-rw-r--r--decoder/ih264d_parse_slice.c6
4 files changed, 15 insertions, 3 deletions
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c
index 40ce3c6..0b4ae80 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -2875,6 +2875,7 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op)
ps_dec->u4_dec_thread_created = 0;
ps_dec->u4_bs_deblk_thread_created = 0;
ps_dec->u4_cur_bs_mb_num = 0;
+ ps_dec->u4_start_recon_deblk = 0;
DEBUG_THREADS_PRINTF(" Starting process call\n");
diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c
index 21ebfa8..5f82110 100644
--- a/decoder/ih264d_parse_headers.c
+++ b/decoder/ih264d_parse_headers.c
@@ -1115,6 +1115,12 @@ WORD32 ih264d_parse_nal_unit(iv_obj_t *dec_hdl,
H264_DEC_DEBUG_PRINT("\nForbidden bit set in Nal Unit, Let's try\n");
}
u1_nal_unit_type = NAL_UNIT_TYPE(u1_first_byte);
+ // if any other nal unit other than slice nal is encountered in between a
+ // frame break out of loop without consuming header
+ if((ps_dec->u2_total_mbs_coded != 0) && (u1_nal_unit_type > IDR_SLICE_NAL))
+ {
+ return ERROR_INCOMPLETE_FRAME;
+ }
ps_dec->u1_nal_unit_type = u1_nal_unit_type;
u1_nal_ref_idc = (UWORD8)(NAL_REF_IDC(u1_first_byte));
//Skip all NALUs if SPS and PPS are not decoded
diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c
index 3cac387..1a4ec6e 100644
--- a/decoder/ih264d_parse_pslice.c
+++ b/decoder/ih264d_parse_pslice.c
@@ -1548,6 +1548,7 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec,
}
}
}
+ ps_dec->u4_first_slice_in_pic = 0;
}
else
{
@@ -1829,11 +1830,13 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec,
H264_DEC_DEBUG_PRINT("Mbs in slice: %d\n", ps_dec->ps_cur_slice->u4_mbs_in_slice);
- ps_dec->u2_cur_slice_num++;
/* incremented here only if first slice is inserted */
if(ps_dec->u4_first_slice_in_pic != 0)
+ {
ps_dec->ps_parse_cur_slice++;
+ ps_dec->u2_cur_slice_num++;
+ }
ps_dec->i2_prev_slice_mbx = ps_dec->u2_mbx;
ps_dec->i2_prev_slice_mby = ps_dec->u2_mby;
diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c
index eef9db5..05db642 100644
--- a/decoder/ih264d_parse_slice.c
+++ b/decoder/ih264d_parse_slice.c
@@ -377,6 +377,7 @@ WORD32 ih264d_start_of_pic(dec_struct_t *ps_dec,
ps_dec->ps_parse_cur_slice = &(ps_dec->ps_dec_slice_buf[0]);
ps_dec->ps_decode_cur_slice = &(ps_dec->ps_dec_slice_buf[0]);
ps_dec->ps_computebs_cur_slice = &(ps_dec->ps_dec_slice_buf[0]);
+ ps_dec->u2_cur_slice_num = 0;
/* Initialize all the HP toolsets to zero */
ps_dec->s_high_profile.u1_scaling_present = 0;
@@ -585,7 +586,6 @@ WORD32 ih264d_start_of_pic(dec_struct_t *ps_dec,
ps_dec->u2_mv_2mb[1] = 0;
ps_dec->u1_last_pic_not_decoded = 0;
- ps_dec->u2_cur_slice_num = 0;
ps_dec->u2_cur_slice_num_dec_thread = 0;
ps_dec->u2_cur_slice_num_bs = 0;
ps_dec->u4_intra_pred_line_ofst = 0;
@@ -1439,7 +1439,10 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice,
}
if (ps_dec->u4_first_slice_in_pic == 0)
+ {
ps_dec->ps_parse_cur_slice++;
+ ps_dec->u2_cur_slice_num++;
+ }
ps_dec->u1_slice_header_done = 0;
@@ -1914,7 +1917,6 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice,
if(ret != OK)
return ret;
- ps_dec->u2_cur_slice_num++;
/* storing last Mb X and MbY of the slice */
ps_dec->i2_prev_slice_mbx = ps_dec->u2_mbx;
ps_dec->i2_prev_slice_mby = ps_dec->u2_mby;