summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-04-05 12:31:15 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-04-05 12:31:15 -0700
commitf8aa8421ec2b318b2095b920aa411728411b4578 (patch)
treec310d4182df9e0debb7b6f2e4dc754818cb9e5e0
parent68b16a3e8f6f0e4fdc089c9aab5eaa7fb809dd0e (diff)
parent10958a2e65c794961280f8575185d489d2f23f91 (diff)
downloadandroid_external_libavc-f8aa8421ec2b318b2095b920aa411728411b4578.tar.gz
android_external_libavc-f8aa8421ec2b318b2095b920aa411728411b4578.tar.bz2
android_external_libavc-f8aa8421ec2b318b2095b920aa411728411b4578.zip
Merge tag 'android-6.0.1_r24' into HEAD
Ticket: CYNGNOS-2213 Android 6.0.1 release 24
-rw-r--r--decoder/ih264d_api.c9
-rw-r--r--decoder/ih264d_parse_cavlc.c18
2 files changed, 21 insertions, 6 deletions
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c
index cd91483..c264d9a 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -2085,7 +2085,7 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op)
num_mb_skipped = (ps_dec->u2_frm_ht_in_mbs * ps_dec->u2_frm_wd_in_mbs)
- ps_dec->u2_total_mbs_coded;
- if(ps_dec->u4_first_slice_in_pic)
+ if(ps_dec->u4_first_slice_in_pic && (ps_dec->u4_pic_buf_got == 0))
prev_slice_err = 1;
else
prev_slice_err = 2;
@@ -2112,8 +2112,11 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op)
{
ih264d_signal_bs_deblk_thread(ps_dec);
}
- /* dont consume bitstream */
- ps_dec_op->u4_num_bytes_consumed -= bytes_consumed;
+ /* dont consume bitstream for change in resolution case */
+ if(ret == IVD_RES_CHANGED)
+ {
+ ps_dec_op->u4_num_bytes_consumed -= bytes_consumed;
+ }
return IV_FAIL;
}
diff --git a/decoder/ih264d_parse_cavlc.c b/decoder/ih264d_parse_cavlc.c
index a3f345c..b6a0125 100644
--- a/decoder/ih264d_parse_cavlc.c
+++ b/decoder/ih264d_parse_cavlc.c
@@ -443,7 +443,11 @@ WORD32 ih264d_cavlc_4x4res_block_totalcoeff_2to10(UWORD32 u4_isdc,
UWORD32 u4_bitstream_offset = ps_bitstrm->u4_ofst;
UWORD32 u4_trailing_ones = u4_total_coeff_trail_one & 0xFFFF;
UWORD32 u4_total_coeff = u4_total_coeff_trail_one >> 16;
- WORD16 i2_level_arr[16];
+ // To avoid error check at 4x4 level, allocating for 3 extra levels(16+3)
+ // since u4_trailing_ones can at the max be 3. This will be required when
+ // u4_total_coeff is less than u4_trailing_ones
+ WORD16 ai2_level_arr[19];
+ WORD16 *i2_level_arr = &ai2_level_arr[3];
tu_sblk4x4_coeff_data_t *ps_tu_4x4;
WORD16 *pi2_coeff_data;
@@ -721,7 +725,11 @@ WORD32 ih264d_cavlc_4x4res_block_totalcoeff_11to16(UWORD32 u4_isdc,
UWORD32 u4_bitstream_offset = ps_bitstrm->u4_ofst;
UWORD32 u4_trailing_ones = u4_total_coeff_trail_one & 0xFFFF;
UWORD32 u4_total_coeff = u4_total_coeff_trail_one >> 16;
- WORD16 i2_level_arr[16];
+ // To avoid error check at 4x4 level, allocating for 3 extra levels(16+3)
+ // since u4_trailing_ones can at the max be 3. This will be required when
+ // u4_total_coeff is less than u4_trailing_ones
+ WORD16 ai2_level_arr[19];//
+ WORD16 *i2_level_arr = &ai2_level_arr[3];
tu_sblk4x4_coeff_data_t *ps_tu_4x4;
WORD16 *pi2_coeff_data;
@@ -993,7 +1001,11 @@ void ih264d_rest_of_residual_cav_chroma_dc_block(UWORD32 u4_total_coeff_trail_on
UWORD32 u4_bitstream_offset = ps_bitstrm->u4_ofst;
UWORD32 u4_trailing_ones = u4_total_coeff_trail_one & 0xFFFF;
UWORD32 u4_total_coeff = u4_total_coeff_trail_one >> 16;
- WORD16 i2_level_arr[4];
+ // To avoid error check at 4x4 level, allocating for 3 extra levels(4+3)
+ // since u4_trailing_ones can at the max be 3. This will be required when
+ // u4_total_coeff is less than u4_trailing_ones
+ WORD16 ai2_level_arr[7];//
+ WORD16 *i2_level_arr = &ai2_level_arr[3];
tu_sblk4x4_coeff_data_t *ps_tu_4x4;
WORD16 *pi2_coeff_data;