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

DO NOT MERGE - Merge Android R QPR1

Browse source 
Bug: 172690556
Merged-In: I2e739d3606ba9f0938ebc2363cb9443ec3dec912
Change-Id: I2e0af6e3fc539ee2d010d1638a324f8cd33934a1
This commit is contained in:
Xin Li 2020-12-08 23:48:54 -08:00
commit 01b93dd80c
4 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
decoder/ih264d_bitstrm.h
View file

@ -57,7 +57,7 @@ typedef struct
{ {
UWORD32 u4_ofst; /* Offset in the buffer for the current bit */ UWORD32 u4_ofst; /* Offset in the buffer for the current bit */
UWORD32 *pu4_buffer; /* Bitstream Buffer */ UWORD32 *pu4_buffer; /* Bitstream Buffer */
UWORD32 u4_max_ofst; /* Position of the last bit read in the current buffer */ UWORD32 u4_max_ofst; /* points to first bit beyond the buffer */
void * pv_codec_handle; /* For Error Handling */ void * pv_codec_handle; /* For Error Handling */
} dec_bit_stream_t; } dec_bit_stream_t;
@ -88,10 +88,13 @@ WORD32 ih264d_flush_bits_h264(dec_bit_stream_t *, WORD32);
************************************************************************** **************************************************************************
*/ */
#define MORE_RBSP_DATA(ps_bitstrm) \
(ps_bitstrm->u4_ofst < ps_bitstrm->u4_max_ofst)
#define EXCEED_OFFSET(ps_bitstrm) \ #define EXCEED_OFFSET(ps_bitstrm) \
(ps_bitstrm->u4_ofst > ps_bitstrm->u4_max_ofst) (ps_bitstrm->u4_ofst > ps_bitstrm->u4_max_ofst)
#define CHECK_BITS_SUFFICIENT(ps_bitstrm, bits_to_read) \
(ps_bitstrm->u4_ofst + bits_to_read <= ps_bitstrm->u4_max_ofst)
#define MORE_RBSP_DATA(ps_bitstrm) \
CHECK_BITS_SUFFICIENT(ps_bitstrm, 1)
void GoToByteBoundary(dec_bit_stream_t * ps_bitstrm); void GoToByteBoundary(dec_bit_stream_t * ps_bitstrm);
UWORD8 ih264d_check_byte_aligned(dec_bit_stream_t * ps_bitstrm); UWORD8 ih264d_check_byte_aligned(dec_bit_stream_t * ps_bitstrm);

2
decoder/ih264d_cabac.c
View file

@ -69,7 +69,7 @@ WORD32 ih264d_init_cabac_dec_envirnoment(decoding_envirnoment_t * ps_cab_env,
32); 32);
FLUSHBITS(ps_bitstrm->u4_ofst, 9) FLUSHBITS(ps_bitstrm->u4_ofst, 9)
if(ps_bitstrm->u4_ofst > ps_bitstrm->u4_max_ofst) if(EXCEED_OFFSET(ps_bitstrm))
return ERROR_EOB_FLUSHBITS_T; return ERROR_EOB_FLUSHBITS_T;
ps_cab_env->u4_code_int_val_ofst = u4_code_int_val_ofst; ps_cab_env->u4_code_int_val_ofst = u4_code_int_val_ofst;

4
decoder/ih264d_parse_headers.c
View file

@ -464,7 +464,7 @@ WORD32 ih264d_parse_pps(dec_struct_t * ps_dec, dec_bit_stream_t * ps_bitstrm)
/* In case bitstream read has exceeded the filled size, then /* In case bitstream read has exceeded the filled size, then
return an error */ return an error */
if(ps_bitstrm->u4_ofst > ps_bitstrm->u4_max_ofst + 8) if(EXCEED_OFFSET(ps_bitstrm))
{ {
return ERROR_INV_SPS_PPS_T; return ERROR_INV_SPS_PPS_T;
} }
@ -1098,7 +1098,7 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm)
/* In case bitstream read has exceeded the filled size, then /* In case bitstream read has exceeded the filled size, then
return an error */ return an error */
if (ps_bitstrm->u4_ofst > ps_bitstrm->u4_max_ofst) if (EXCEED_OFFSET(ps_bitstrm))
{ {
return ERROR_INV_SPS_PPS_T; return ERROR_INV_SPS_PPS_T;
} }

20
decoder/ih264d_sei.c
View file

@ -759,8 +759,12 @@ WORD32 ih264d_parse_sei_message(dec_struct_t *ps_dec,
{ {
ui4_payload_type = 0; ui4_payload_type = 0;
if(!CHECK_BITS_SUFFICIENT(ps_bitstrm, 8))
{
return ERROR_EOB_GETBITS_T;
}
u4_bits = ih264d_get_bits_h264(ps_bitstrm, 8); u4_bits = ih264d_get_bits_h264(ps_bitstrm, 8);
while(0xff == u4_bits && !EXCEED_OFFSET(ps_bitstrm)) while(0xff == u4_bits && CHECK_BITS_SUFFICIENT(ps_bitstrm, 8))
{ {
u4_bits = ih264d_get_bits_h264(ps_bitstrm, 8); u4_bits = ih264d_get_bits_h264(ps_bitstrm, 8);
ui4_payload_type += 255; ui4_payload_type += 255;
@ -768,14 +772,22 @@ WORD32 ih264d_parse_sei_message(dec_struct_t *ps_dec,
ui4_payload_type += u4_bits; ui4_payload_type += u4_bits;
ui4_payload_size = 0; ui4_payload_size = 0;
if(!CHECK_BITS_SUFFICIENT(ps_bitstrm, 8))
{
return ERROR_EOB_GETBITS_T;
}
u4_bits = ih264d_get_bits_h264(ps_bitstrm, 8); u4_bits = ih264d_get_bits_h264(ps_bitstrm, 8);
while(0xff == u4_bits && !EXCEED_OFFSET(ps_bitstrm)) while(0xff == u4_bits && CHECK_BITS_SUFFICIENT(ps_bitstrm, 8))
{ {
u4_bits = ih264d_get_bits_h264(ps_bitstrm, 8); u4_bits = ih264d_get_bits_h264(ps_bitstrm, 8);
ui4_payload_size += 255; ui4_payload_size += 255;
} }
ui4_payload_size += u4_bits; ui4_payload_size += u4_bits;
if(!CHECK_BITS_SUFFICIENT(ps_bitstrm, (ui4_payload_size << 3)))
{
return ERROR_EOB_GETBITS_T;
}
i4_status = ih264d_parse_sei_payload(ps_bitstrm, ui4_payload_type, i4_status = ih264d_parse_sei_payload(ps_bitstrm, ui4_payload_type,
ui4_payload_size, ps_dec); ui4_payload_size, ps_dec);
if(i4_status != OK) if(i4_status != OK)
@ -789,7 +801,7 @@ WORD32 ih264d_parse_sei_message(dec_struct_t *ps_dec,
H264_DEC_DEBUG_PRINT("\nError in parsing SEI message"); H264_DEC_DEBUG_PRINT("\nError in parsing SEI message");
} }
while(0 == ih264d_check_byte_aligned(ps_bitstrm) while(0 == ih264d_check_byte_aligned(ps_bitstrm)
&& !EXCEED_OFFSET(ps_bitstrm)) && CHECK_BITS_SUFFICIENT(ps_bitstrm, 1))
{ {
u4_bits = ih264d_get_bit_h264(ps_bitstrm); u4_bits = ih264d_get_bit_h264(ps_bitstrm);
if(u4_bits) if(u4_bits)
@ -799,7 +811,7 @@ WORD32 ih264d_parse_sei_message(dec_struct_t *ps_dec,
} }
} }
} }
while(ps_bitstrm->u4_ofst < ps_bitstrm->u4_max_ofst); while(MORE_RBSP_DATA(ps_bitstrm));
return (i4_status); return (i4_status);
} }