wrapper/libavc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Decoder: Add null check for scaling matrix.

Browse source 
Also void->word32 return type so failure can be signaled to caller.

Bug: 115743419
Test: vendor + poc
Change-Id: I0a07ac11255c2c672803aab7085824c417bde282
This commit is contained in:
S Hamsalekha 2018-12-27 13:57:55 +05:30 • committed by Ray Essick
parent c8bcfb3f66
commit f28de0366c
3 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
decoder/ih264d_parse_slice.c
View file

@ -690,12 +690,12 @@ WORD32 ih264d_start_of_pic(dec_struct_t *ps_dec,
if((ps_seq->i4_seq_scaling_matrix_present_flag)
|| (ps_pps->i4_pic_scaling_matrix_present_flag))
{
ih264d_form_scaling_matrix_picture(ps_seq, ps_pps, ps_dec);
ret = ih264d_form_scaling_matrix_picture(ps_seq, ps_pps, ps_dec);
ps_dec->s_high_profile.u1_scaling_present = 1;
}
else
{
ih264d_form_default_scaling_matrix(ps_dec);
ret = ih264d_form_default_scaling_matrix(ps_dec);
}
if(ps_pps->i4_transform_8x8_mode_flag)
@ -705,9 +705,12 @@ WORD32 ih264d_start_of_pic(dec_struct_t *ps_dec,
}
else
{
ih264d_form_default_scaling_matrix(ps_dec);
ret = ih264d_form_default_scaling_matrix(ps_dec);
}
if(ret != OK)
return ret;
/* required while reading the transform_size_8x8 u4_flag */
ps_dec->s_high_profile.u1_direct_8x8_inference_flag =
ps_seq->u1_direct_8x8_inference_flag;

18
decoder/ih264d_quant_scaling.c
View file

@ -74,7 +74,7 @@ void ih264d_scaling_list(WORD16 *pi2_scaling_list,
}
}
void ih264d_form_default_scaling_matrix(dec_struct_t *ps_dec)
WORD32 ih264d_form_default_scaling_matrix(dec_struct_t *ps_dec)
{
/*************************************************************************/
@ -108,11 +108,12 @@ void ih264d_form_default_scaling_matrix(dec_struct_t *ps_dec)
}
}
}
return OK;
}
void ih264d_form_scaling_matrix_picture(dec_seq_params_t *ps_seq,
dec_pic_params_t *ps_pic,
dec_struct_t *ps_dec)
WORD32 ih264d_form_scaling_matrix_picture(dec_seq_params_t *ps_seq,
dec_pic_params_t *ps_pic,
dec_struct_t *ps_dec)
{
/* default scaling matrices */
WORD32 i4_i;
@ -216,7 +217,7 @@ void ih264d_form_scaling_matrix_picture(dec_seq_params_t *ps_seq,
{
if(!ps_pic->u1_pic_scaling_list_present_flag[i4_i])
{
if(!ps_seq->u1_seq_scaling_list_present_flag[i4_i])
if(!ps_seq->i4_seq_scaling_matrix_present_flag)
{
ps_dec->s_high_profile.pi2_scale_mat[i4_i] =
(i4_i == 6) ? ((WORD16*)gai2_ih264d_default_intra8x8) : ((WORD16*)gai2_ih264d_default_inter8x8);
@ -251,6 +252,9 @@ void ih264d_form_scaling_matrix_picture(dec_seq_params_t *ps_seq,
/* for all 4x4 matrices */
for(i4_i = 0; i4_i < 6; i4_i++)
{
if(ps_dec->s_high_profile.pi2_scale_mat[i4_i] == NULL)
return ERROR_CORRUPTED_SLICE;
for(i4_j = 0; i4_j < 16; i4_j++)
{
ps_dec->s_high_profile.i2_scalinglist4x4[i4_i][pu1_inv_scan_4x4[i4_j]] =
@ -262,6 +266,9 @@ void ih264d_form_scaling_matrix_picture(dec_seq_params_t *ps_seq,
/* for all 8x8 matrices */
for(i4_i = 0; i4_i < 2; i4_i++)
{
if(ps_dec->s_high_profile.pi2_scale_mat[i4_i + 6] == NULL)
return ERROR_CORRUPTED_SLICE;
for(i4_j = 0; i4_j < 64; i4_j++)
{
ps_dec->s_high_profile.i2_scalinglist8x8[i4_i][gau1_ih264d_inv_scan_prog8x8_cabac[i4_j]] =
@ -270,5 +277,6 @@ void ih264d_form_scaling_matrix_picture(dec_seq_params_t *ps_seq,
}
}
}
return OK;
}

8
decoder/ih264d_quant_scaling.h
View file

@ -25,11 +25,11 @@ void ih264d_scaling_list(WORD16 *pi2_scaling_list,
dec_bit_stream_t *ps_bitstrm);
void ih264d_form_scaling_matrix_picture(dec_seq_params_t *ps_seq,
dec_pic_params_t *ps_pic,
dec_struct_t *ps_dec);
WORD32 ih264d_form_scaling_matrix_picture(dec_seq_params_t *ps_seq,
dec_pic_params_t *ps_pic,
dec_struct_t *ps_dec);
void ih264d_form_default_scaling_matrix(dec_struct_t *ps_dec);
WORD32 ih264d_form_default_scaling_matrix(dec_struct_t *ps_dec);