{
if( p_sys->b_master_sync )
{
- mtime_t i_dts = date_Get( &id->interpolated_pts ) + 1;
- if ( p_audio_buf->i_pts - i_dts > MASTER_SYNC_MAX_DRIFT
- || p_audio_buf->i_pts - i_dts < -MASTER_SYNC_MAX_DRIFT )
+ mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
+ mtime_t i_drift = p_audio_buf->i_pts - i_pts;
+ if (i_drift > MASTER_SYNC_MAX_DRIFT || i_drift < -MASTER_SYNC_MAX_DRIFT)
{
- msg_Dbg( p_stream, "drift is too high, resetting master sync" );
+ msg_Dbg( p_stream,
+ "drift is too high (%"PRId64"), resetting master sync",
+ i_drift );
date_Set( &id->interpolated_pts, p_audio_buf->i_pts );
- i_dts = p_audio_buf->i_pts + 1;
+ i_pts = p_audio_buf->i_pts + 1;
}
- p_sys->i_master_drift = p_audio_buf->i_pts - i_dts;
+ p_sys->i_master_drift = p_audio_buf->i_pts - i_pts;
date_Increment( &id->interpolated_pts, p_audio_buf->i_nb_samples );
- p_audio_buf->i_pts -= p_sys->i_master_drift;
+ p_audio_buf->i_pts = i_pts;
}
p_audio_buf->i_dts = p_audio_buf->i_pts;
if( p_sys->b_master_sync )
{
- mtime_t i_video_drift;
mtime_t i_master_drift = p_sys->i_master_drift;
- mtime_t i_pts;
+ mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
+ mtime_t i_video_drift = p_pic->date - i_pts;
- i_pts = date_Get( &id->interpolated_pts ) + 1;
- if ( unlikely( p_pic->date - i_pts > MASTER_SYNC_MAX_DRIFT
- || p_pic->date - i_pts < -MASTER_SYNC_MAX_DRIFT ) )
+ if ( unlikely( i_video_drift > MASTER_SYNC_MAX_DRIFT
+ || i_video_drift < -MASTER_SYNC_MAX_DRIFT ) )
{
- msg_Dbg( p_stream, "drift is too high, resetting master sync" );
+ msg_Dbg( p_stream,
+ "drift is too high (%"PRId64", resetting master sync",
+ i_video_drift );
date_Set( &id->interpolated_pts, p_pic->date );
i_pts = p_pic->date + 1;
}
if( p_sys->b_master_sync )
{
mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
- if (unlikely ( p_pic->date - i_pts > MASTER_SYNC_MAX_DRIFT
- || p_pic->date - i_pts < -MASTER_SYNC_MAX_DRIFT ) )
+ mtime_t i_video_drift = p_pic->date - i_pts;
+ if (unlikely ( i_video_drift > MASTER_SYNC_MAX_DRIFT
+ || i_video_drift < -MASTER_SYNC_MAX_DRIFT ) )
{
- msg_Dbg( p_stream, "drift is too high, resetting master sync" );
+ msg_Dbg( p_stream,
+ "drift is too high (%"PRId64"), resetting master sync",
+ i_video_drift );
date_Set( &id->interpolated_pts, p_pic->date );
i_pts = p_pic->date + 1;
}