Skip to content

V
vlc-2-2
Commit af762f81 authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

transcode: don't check drift if we have VLC_TS_INVALID pts

parent 2b12cd63
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
modules/stream_out/transcode/audio.c
View file @ af762f81
...@@ -204,8 +204,13 @@ int transcode_audio_process( sout_stream_t *p_stream, ...@@ -204,8 +204,13 @@ int transcode_audio_process( sout_stream_t *p_stream,
if( p_sys->b_master_sync ) if( p_sys->b_master_sync )
{ {
mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1; mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
mtime_t i_drift = p_audio_buf->i_pts - i_pts; mtime_t i_drift = 0;
if (i_drift > MASTER_SYNC_MAX_DRIFT || i_drift < -MASTER_SYNC_MAX_DRIFT)
if( likely( p_audio_buf->i_pts != VLC_TS_INVALID ) )
i_drift = p_audio_buf->i_pts - i_pts;
if ( unlikely(i_drift > MASTER_SYNC_MAX_DRIFT
|| i_drift < -MASTER_SYNC_MAX_DRIFT) )
{ {
msg_Dbg( p_stream, msg_Dbg( p_stream,
"audio drift is too high (%"PRId64"), resetting master sync", "audio drift is too high (%"PRId64"), resetting master sync",
...@@ -213,6 +218,7 @@ int transcode_audio_process( sout_stream_t *p_stream, ...@@ -213,6 +218,7 @@ int transcode_audio_process( sout_stream_t *p_stream,
date_Set( &id->interpolated_pts, p_audio_buf->i_pts ); date_Set( &id->interpolated_pts, p_audio_buf->i_pts );
i_pts = p_audio_buf->i_pts + 1; i_pts = p_audio_buf->i_pts + 1;
} }
if( likely(p_audio_buf->i_pts != VLC_TS_INVALID ) )
p_sys->i_master_drift = p_audio_buf->i_pts - i_pts; p_sys->i_master_drift = p_audio_buf->i_pts - i_pts;
date_Increment( &id->interpolated_pts, p_audio_buf->i_nb_samples ); date_Increment( &id->interpolated_pts, p_audio_buf->i_nb_samples );
p_audio_buf->i_pts = i_pts; p_audio_buf->i_pts = i_pts;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment