Commit b69d64d4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Fix previous commit

parent 2852aba4
...@@ -342,8 +342,6 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout, ...@@ -342,8 +342,6 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
p_aout->output.fifo.pp_last = &p_aout->output.fifo.p_first; p_aout->output.fifo.pp_last = &p_aout->output.fifo.p_first;
} }
aout_unlock_output_fifo( p_aout );
if ( !b_can_sleek && if ( !b_can_sleek &&
( (p_buffer->i_pts - start_date > AOUT_PTS_TOLERANCE) ( (p_buffer->i_pts - start_date > AOUT_PTS_TOLERANCE)
|| (start_date - p_buffer->i_pts > AOUT_PTS_TOLERANCE) ) ) || (start_date - p_buffer->i_pts > AOUT_PTS_TOLERANCE) ) )
...@@ -354,6 +352,9 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout, ...@@ -354,6 +352,9 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
msg_Warn( p_aout, "output date isn't PTS date, requesting " msg_Warn( p_aout, "output date isn't PTS date, requesting "
"resampling (%"PRId64")", difference ); "resampling (%"PRId64")", difference );
aout_FifoMoveDates( p_aout, &p_aout->output.fifo, difference );
aout_unlock_output_fifo( p_aout );
aout_lock_input_fifos( p_aout ); aout_lock_input_fifos( p_aout );
for ( i = 0; i < p_aout->i_nb_inputs; i++ ) for ( i = 0; i < p_aout->i_nb_inputs; i++ )
{ {
...@@ -361,10 +362,10 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout, ...@@ -361,10 +362,10 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
aout_FifoMoveDates( p_aout, p_fifo, difference ); aout_FifoMoveDates( p_aout, p_fifo, difference );
} }
aout_FifoMoveDates( p_aout, &p_aout->output.fifo, difference );
aout_unlock_input_fifos( p_aout ); aout_unlock_input_fifos( p_aout );
} }
else
aout_unlock_output_fifo( p_aout );
return p_buffer; return p_buffer;
} }
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