videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

Merge branch 'vout-corrupted-date' into 'master' 

vout: don't wait for corrupted pictures

Closes #28339

See merge request videolan/vlc!4039
This commit is contained in:
Thomas Guillem 2024-04-28 07:10:49 +00:00
parent 7d6abadd24 e6239fa494
commit f8d69a1783
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/codec/omxil/mediacodec.c
View File

@ -122,6 +122,7 @@ typedef struct decoder_sys_t
int i_decode_flags;
vlc_tick_t max_ts;
enum es_format_category_e cat;
union
{
@ -857,10 +858,8 @@ static int OpenDecoder(vlc_object_t *p_this, pf_MediaCodecApi_init pf_init)
p_sys->api.i_codec = p_dec->fmt_in->i_codec;
p_sys->api.i_cat = p_dec->fmt_in->i_cat;
p_sys->api.psz_mime = mime;
p_sys->video.i_mpeg_dar_num = 0;
p_sys->video.i_mpeg_dar_den = 0;
p_sys->video.surfacetexture = NULL;
p_sys->b_decoder_dead = false;
p_sys->max_ts = VLC_TICK_0;
if (pf_init(&p_sys->api) != 0)
{
@ -897,6 +896,10 @@ static int OpenDecoder(vlc_object_t *p_this, pf_MediaCodecApi_init pf_init)
if (p_dec->fmt_in->i_cat == VIDEO_ES)
{
p_sys->video.i_mpeg_dar_num = 0;
p_sys->video.i_mpeg_dar_den = 0;
p_sys->video.surfacetexture = NULL;
switch (p_dec->fmt_in->i_codec)
{
case VLC_CODEC_H264:
@ -1145,6 +1148,16 @@ static int Video_ProcessOutput(decoder_t *p_dec, mc_api_out *p_out,
p_pic->date = p_out->buf.i_ts;
else
p_pic->date = forced_ts;
if (p_pic->date > p_sys->max_ts)
{
msg_Warn(p_dec, "Dropping picture with invalid ts"
"(pic_ts=%"PRId64" vs last_input_ts=%"PRId64")",
p_pic->date, p_sys->max_ts);
picture_Release(p_pic);
return p_sys->api.release_out(&p_sys->api, p_out->buf.i_index, false);
}
p_pic->b_progressive = true;
if (p_sys->api.b_direct_rendering)
@ -1571,6 +1584,8 @@ static int QueueBlockLocked(decoder_t *p_dec, block_t *p_in_block,
}
p_buf = p_block->p_buffer;
i_size = p_block->i_buffer;
if (i_ts > p_sys->max_ts)
p_sys->max_ts = i_ts;
}
if (p_sys->api.queue_in(&p_sys->api, i_index, p_buf, i_size,