wrapper/libhevc-mirror
1
0
Fork 0
mirror of https://github.com/ittiam-systems/libhevc.git synced 2026-08-15 07:12:36 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge "Fix in handling wrong cu_qp_delta" into lmp-dev am: 98f9e26d24 am: 10f2b105f5 am: b4ddce56d1 am: 59b232588b am: ca85c43d8d am: fc093b18cd

Browse source 
am: 4f28fb5344

Change-Id: If74f86a089ab5a093387c6a1e9708961ff8cf4fc
This commit is contained in:
Marco Nelissen 2017-02-14 23:08:53 +00:00 • committed by android-build-merger
commit 29a107d6fb
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
decoder/ihevcd_cabac.c
View file

@ -669,14 +669,13 @@ UWORD32 ihevcd_cabac_decode_bypass_bins_egk(cab_ctxt_t *ps_cabac,
numones = k;
bin = 1;
u4_sym = 0;
while(bin)
while(bin && (numones <= 16))
{
IHEVCD_CABAC_DECODE_BYPASS_BIN(bin, ps_cabac, ps_bitstrm);
u4_sym += bin << numones++;
}
numones -= 1;
numones = CLIP3(numones, 0, 16);
if(numones)
{

11
decoder/ihevcd_parse_slice.c
View file

@ -82,6 +82,9 @@
/* Bit stream offset threshold */
#define BITSTRM_OFF_THRS 8
#define MIN_CU_QP_DELTA_ABS(x) (-26 + ((x) * 6) / 2)
#define MAX_CU_QP_DELTA_ABS(x) (25 + ((x) * 6) / 2)
/**
* Table used to decode part_mode if AMP is enabled and current CU is not min CU
*/
@ -302,7 +305,6 @@ WORD32 ihevcd_parse_transform_tree(codec_t *ps_codec,
}
AEV_TRACE("cu_qp_delta_abs", cu_qp_delta_abs, ps_cabac->u4_range);
ps_codec->s_parse.i4_is_cu_qp_delta_coded = 1;
@ -315,6 +317,13 @@ WORD32 ihevcd_parse_transform_tree(codec_t *ps_codec,
cu_qp_delta_abs = -cu_qp_delta_abs;
}
if (cu_qp_delta_abs < MIN_CU_QP_DELTA_ABS(ps_sps->i1_bit_depth_luma_minus8)
|| cu_qp_delta_abs > MAX_CU_QP_DELTA_ABS(ps_sps->i1_bit_depth_luma_minus8))
{
return IHEVCD_INVALID_PARAMETER;
}
ps_codec->s_parse.s_cu.i4_cu_qp_delta = cu_qp_delta_abs;
}