[vlc-commits] decoder: check missing audio block dates early
Steve Lhomme
git at videolan.org
Tue Sep 3 10:12:21 CEST 2019
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Aug 27 07:22:56 2019 +0200| [5507691883883d5f12f245c0a6198b52dc8d2ee4] | committer: Steve Lhomme
decoder: check missing audio block dates early
Especially before we check this date against the i_preroll_end.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5507691883883d5f12f245c0a6198b52dc8d2ee4
---
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 faedada0a3..491f18d05b 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1127,6 +1127,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_EGENERIC;
+ }
+
vlc_mutex_lock( &p_owner->lock );
if( p_owner->i_preroll_end > p_audio->i_pts )
{
@@ -1148,13 +1155,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_EGENERIC;
- }
-
/* */
vlc_mutex_lock( &p_owner->lock );
if( p_owner->b_waiting )
More information about the vlc-commits
mailing list