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

Merge "Decoder: Fixed incorrect use of mmco parameters." into mnc-dev

Browse source 
am: 4d0407c0bb

Change-Id: Iad247fb8d10d2610fe5f8d6bb064fc52b20952ba
This commit is contained in:
Ritu Baldwa 2017-11-02 23:36:53 +00:00 • committed by android-build-merger
commit 3bde3e435c
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
decoder/ih264d_dpb_mgr.c
View file

@ -842,7 +842,7 @@ WORD32 ih264d_ref_idx_reordering(dec_struct_t *ps_dec, UWORD8 uc_lx)
WORD32 ih264d_read_mmco_commands(struct _DecStruct * ps_dec) WORD32 ih264d_read_mmco_commands(struct _DecStruct * ps_dec)
{ {
dec_bit_stream_t *ps_bitstrm = ps_dec->ps_bitstrm; dec_bit_stream_t *ps_bitstrm = ps_dec->ps_bitstrm;
dpb_commands_t *ps_dpb_cmds = ps_dec->ps_dpb_cmds; dpb_commands_t *ps_dpb_cmds = &(ps_dec->s_dpb_cmds_scratch);
dec_slice_params_t * ps_slice = ps_dec->ps_cur_slice; dec_slice_params_t * ps_slice = ps_dec->ps_cur_slice;
WORD32 j; WORD32 j;
UWORD8 u1_buf_mode; UWORD8 u1_buf_mode;

9
decoder/ih264d_parse_slice.c
View file

@ -1858,6 +1858,15 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice,
if(ret != OK) if(ret != OK)
return ret; return ret;
if(u1_nal_ref_idc != 0)
{
if(!ps_dec->ps_dpb_cmds->u1_dpb_commands_read)
{
memcpy((void *)ps_dec->ps_dpb_cmds, (void *)(&(ps_dec->s_dpb_cmds_scratch)),
sizeof(dpb_commands_t));
}
}
/* storing last Mb X and MbY of the slice */ /* storing last Mb X and MbY of the slice */
ps_dec->i2_prev_slice_mbx = ps_dec->u2_mbx; ps_dec->i2_prev_slice_mbx = ps_dec->u2_mbx;
ps_dec->i2_prev_slice_mby = ps_dec->u2_mby; ps_dec->i2_prev_slice_mby = ps_dec->u2_mby;

1
decoder/ih264d_structs.h
View file

@ -968,6 +968,7 @@ typedef struct _DecStruct
/* Variables for Decode Buffer Management */ /* Variables for Decode Buffer Management */
dpb_manager_t *ps_dpb_mgr; dpb_manager_t *ps_dpb_mgr;
dpb_commands_t *ps_dpb_cmds; dpb_commands_t *ps_dpb_cmds;
dpb_commands_t s_dpb_cmds_scratch;
/* Variables Required for N MB design */ /* Variables Required for N MB design */
dec_mb_info_t *ps_nmb_info; dec_mb_info_t *ps_nmb_info;