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

Decoder: Fix in checking for valid profile flags am: d7eee555dc am: 637cb7f434

Browse source 
am: 3735b426ae

Change-Id: Ife0c404493f9bcf05c7faf73bc3b0e08cb57fb99
This commit is contained in:
Harish Mahendrakar 2016-12-08 00:25:03 +00:00 • committed by android-build-merger
commit 4b8b6ff6cb
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
decoder/ih264d_defs.h
View file

@ -257,6 +257,7 @@ enum
/** Profile Types*/
#define BASE_PROFILE_IDC 66
#define MAIN_PROFILE_IDC 77
#define EXTENDED_PROFILE_IDC 88
#define HIGH_PROFILE_IDC 100

18
decoder/ih264d_parse_headers.c
View file

@ -533,18 +533,14 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm)
)
{
if((uc_constraint_set1_flag != 1) && (uc_constraint_set0_flag != 1))
/* Apart from Baseline, main and high profile,
* only extended profile is supported provided
* uc_constraint_set0_flag or uc_constraint_set1_flag are set to 1
*/
if((u1_profile_idc != EXTENDED_PROFILE_IDC) ||
((uc_constraint_set1_flag != 1) && (uc_constraint_set0_flag != 1)))
{
if(NULL != ps_dec)
{
UWORD32 i4_error_code;
i4_error_code = ERROR_FEATURE_UNAVAIL;
return i4_error_code;
}
else
{
return (ERROR_FEATURE_UNAVAIL);
}
return (ERROR_FEATURE_UNAVAIL);
}
}