[vlc-devel] [PATCH 05/11] decoder: check missing audio block dates early
Steve Lhomme
robux4 at ycbcr.xyz
Fri Aug 30 07:55:42 CEST 2019
Especially before we check this date against the i_preroll_end.
---
src/input/decoder.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/input/decoder.c b/src/input/decoder.c
index d4a5d3475b..cd940c4f15 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1126,6 +1126,13 @@ static int DecoderPlayAudio( struct decoder_owner *p_owner, block_t *p_audio )
assert( p_audio != NULL );
+ if( p_audio->i_pts == VLC_TICK_INVALID ) // FIXME --VLC_TICK_INVALID verify audio_output/*
+ {
+ msg_Warn( p_dec, "non-dated audio buffer received" );
+ block_Release( p_audio );
+ return VLC_SUCCESS;
+ }
+
vlc_mutex_lock( &p_owner->lock );
if( p_owner->i_preroll_end > p_audio->i_pts )
{
@@ -1147,13 +1154,6 @@ static int DecoderPlayAudio( struct decoder_owner *p_owner, block_t *p_audio )
}
/* */
- if( p_audio->i_pts == VLC_TICK_INVALID ) // FIXME --VLC_TICK_INVALID verify audio_output/*
- {
- msg_Warn( p_dec, "non-dated audio buffer received" );
- block_Release( p_audio );
- return VLC_SUCCESS;
- }
-
/* */
vlc_mutex_lock( &p_owner->lock );
if( p_owner->b_waiting )
--
2.17.1
More information about the vlc-devel
mailing list