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

[automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5

Browse source 
Change-Id: Id6d3411d949ae069369d7bef1c50f904cf9c97dc
This commit is contained in:
Android Build Merger (Role) 2019-05-08 18:45:13 +00:00
commit b1734142ff
2 changed files with 68 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

67
decoder/ih264d_parse_slice.c
View file

@ -979,6 +979,69 @@ WORD32 ih264d_end_of_pic(dec_struct_t *ps_dec)
return OK;
}
/*!
**************************************************************************
* \if Function name : ih264d_fix_error_in_dpb \endif
*
* \brief
* fix error in DPB
*
* \return
* Number of node(s) deleted
**************************************************************************
*/
WORD32 ih264d_fix_error_in_dpb(dec_struct_t *ps_dec)
{
/*--------------------------------------------------------------------*/
/* If there is common node in lt_list and st_list then delete it from */
/* st_list */
/*--------------------------------------------------------------------*/
UWORD8 no_of_nodes_deleted = 0;
UWORD8 lt_ref_num = ps_dec->ps_dpb_mgr->u1_num_lt_ref_bufs;
struct dpb_info_t *ps_lt_curr_dpb = ps_dec->ps_dpb_mgr->ps_dpb_ht_head;
while(lt_ref_num && ps_lt_curr_dpb)
{
if(ps_dec->ps_dpb_mgr->ps_dpb_st_head
&& ((ps_lt_curr_dpb->s_bot_field.u1_reference_info
| ps_lt_curr_dpb->s_top_field.u1_reference_info)
== (IS_SHORT_TERM | IS_LONG_TERM)))
{
struct dpb_info_t *ps_st_next_dpb = ps_dec->ps_dpb_mgr->ps_dpb_st_head;
struct dpb_info_t *ps_st_curr_dpb = ps_dec->ps_dpb_mgr->ps_dpb_st_head;
UWORD8 st_ref_num = ps_dec->ps_dpb_mgr->u1_num_st_ref_bufs;
while(st_ref_num && ps_st_curr_dpb)
{
if(ps_st_curr_dpb == ps_lt_curr_dpb)
{
if(st_ref_num == ps_dec->ps_dpb_mgr->u1_num_st_ref_bufs)
{
ps_dec->ps_dpb_mgr->ps_dpb_st_head =
ps_dec->ps_dpb_mgr->ps_dpb_st_head->ps_prev_short;
ps_st_curr_dpb = ps_dec->ps_dpb_mgr->ps_dpb_st_head;
}
else
{
ps_st_next_dpb->ps_prev_short = ps_st_curr_dpb->ps_prev_short;
}
ps_dec->ps_dpb_mgr->u1_num_st_ref_bufs--;
ps_dec->ps_dpb_mgr->u1_num_lt_ref_bufs++;
no_of_nodes_deleted++;
break;
}
ps_st_next_dpb = ps_st_curr_dpb;
ps_st_curr_dpb = ps_st_curr_dpb->ps_prev_short;
st_ref_num--;
}
}
ps_lt_curr_dpb = ps_lt_curr_dpb->ps_prev_long;
lt_ref_num--;
}
return no_of_nodes_deleted;
}
/*!
**************************************************************************
* \if Function name : DecodeSlice \endif
@ -1821,6 +1884,10 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice,
ps_dec->pv_proc_tu_coeff_data = ps_dec->pv_parse_tu_coeff_data;
}
ret = ih264d_fix_error_in_dpb(ps_dec);
if(ret < 0)
return ERROR_DBP_MANAGER_T;
if(u1_slice_type == I_SLICE)
{
ps_dec->ps_cur_pic->u4_pack_slc_typ |= I_SLC_BIT;

1
decoder/ih264d_parse_slice.h
View file

@ -37,6 +37,7 @@
#include "ih264_platform_macros.h"
#include "ih264d_structs.h"
#include "ih264d_error_handler.h"
WORD32 ih264d_fix_error_in_dpb(dec_struct_t * ps_dec);
WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice,
UWORD8 u1_nal_ref_idc,
dec_struct_t * ps_dec );