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

Merge "decoder: Update reorder depth to account for display latency" am: adfbdd6c41

Browse source 
Original change: 1398927

Change-Id: I6a482931e4d5d006c88d8526e2936975a649636a
This commit is contained in:
Ray Essick 2020-08-17 05:34:23 +00:00 • committed by Automerger Merge Worker
commit b2016b613a
3 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
decoder/ih264d_defs.h
View file

@ -45,6 +45,11 @@
#define FMT_CONV_NUM_ROWS 16
/** Decoder currently has an additional latency of 2 pictures when
* returning output for display
*/
#define DISPLAY_LATENCY 2
/** Bit manipulation macros */
#define CHECKBIT(a,i) ((a) & (1 << i))
#define CLEARBIT(a,i) ((a) &= ~(1 << i))

17
decoder/ih264d_parse_headers.c
View file

@ -1091,6 +1091,23 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm)
/*--------------------------------------------------------------------*/
/* All initializations to ps_dec are beyond this point */
/*--------------------------------------------------------------------*/
{
WORD32 reorder_depth = ih264d_get_dpb_size(ps_seq);
if((1 == ps_seq->u1_vui_parameters_present_flag) &&
(1 == ps_seq->s_vui.u1_bitstream_restriction_flag))
{
reorder_depth = ps_seq->s_vui.u4_num_reorder_frames + 1;
}
if (reorder_depth > H264_MAX_REF_PICS)
{
return ERROR_INV_SPS_PPS_T;
}
if(ps_seq->u1_frame_mbs_only_flag != 1)
reorder_depth *= 2;
ps_dec->i4_reorder_depth = reorder_depth + DISPLAY_LATENCY;
}
ps_dec->u2_disp_height = i4_cropped_ht;
ps_dec->u2_disp_width = i4_cropped_wd;

1
decoder/ih264d_utils.c
View file

@ -770,7 +770,6 @@ WORD32 ih264d_init_pic(dec_struct_t *ps_dec,
else
ps_dec->i4_display_delay = ps_seq->s_vui.u4_num_reorder_frames * 2 + 2;
}
ps_dec->i4_reorder_depth = ps_dec->i4_display_delay;
if(IVD_DECODE_FRAME_OUT == ps_dec->e_frm_out_mode)
ps_dec->i4_display_delay = 0;