diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-03 08:31:20 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-03 08:31:20 +0000 |
| commit | b3c702b2c8d299043dd022e8182fa30febacb4ab (patch) | |
| tree | 706b47a0d0b8d10f3b3117bd08e36b1f50c3a546 | |
| parent | 9b1a7bdf4f99c67b38cdf36e3da7f6bea2106a28 (diff) | |
| parent | cac92261540f5658c42ff3a12731f06b8dec2bd2 (diff) | |
| download | android_external_libavc-b3c702b2c8d299043dd022e8182fa30febacb4ab.tar.gz android_external_libavc-b3c702b2c8d299043dd022e8182fa30febacb4ab.tar.bz2 android_external_libavc-b3c702b2c8d299043dd022e8182fa30febacb4ab.zip | |
Snap for 4481641 from cac92261540f5658c42ff3a12731f06b8dec2bd2 to pi-release
Change-Id: I8d672a1f64512f205640e5bcdaa56eb5bb9ca7b9
| -rw-r--r-- | decoder/ih264d_dpb_mgr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/decoder/ih264d_dpb_mgr.c b/decoder/ih264d_dpb_mgr.c index f6417c7..525adef 100644 --- a/decoder/ih264d_dpb_mgr.c +++ b/decoder/ih264d_dpb_mgr.c @@ -722,7 +722,7 @@ WORD32 ih264d_ref_idx_reordering(dec_struct_t *ps_dec, UWORD8 uc_lx) UWORD16 ui_max_frame_num = ps_dec->ps_cur_sps->u2_u4_max_pic_num_minus1 + 1; - WORD32 i; + WORD32 i, count = 0; UWORD32 ui_remapIdc, ui_nextUev; WORD16 u2_pred_frame_num = u4_cur_pic_num; WORD32 i_temp; @@ -743,7 +743,8 @@ WORD32 ih264d_ref_idx_reordering(dec_struct_t *ps_dec, UWORD8 uc_lx) ui_remapIdc = ih264d_uev(pu4_bitstrm_ofst, pu4_bitstrm_buf); - while(ui_remapIdc != 3) + while((ui_remapIdc != 3) + && (count < ps_cur_slice->u1_num_ref_idx_lx_active[uc_lx])) { ui_nextUev = ih264d_uev(pu4_bitstrm_ofst, pu4_bitstrm_buf); if(ui_remapIdc != 2) @@ -812,6 +813,7 @@ WORD32 ih264d_ref_idx_reordering(dec_struct_t *ps_dec, UWORD8 uc_lx) ui_remapIdc = ih264d_uev(pu4_bitstrm_ofst, pu4_bitstrm_buf); /* Get the remapping_idc - 0/1/2/3 */ + count++; } //Handle the ref indices that were not remapped |