Skip to content

V
vlc-1.1
Commit d4ccb69d authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* src/audio_output/input.c: corrective audio resampling should be a lot more gradual now.

parent 49245e40
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
src/audio_output/input.c
View file @ d4ccb69d
...@@ -454,11 +454,11 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, ...@@ -454,11 +454,11 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
if( p_input->i_resampling_type == AOUT_RESAMPLING_UP ) if( p_input->i_resampling_type == AOUT_RESAMPLING_UP )
{ {
p_input->pp_resamplers[0]->input.i_rate += 10; /* Hz */ p_input->pp_resamplers[0]->input.i_rate += 1; /* Hz */
} }
else else
{ {
p_input->pp_resamplers[0]->input.i_rate -= 10; /* Hz */ p_input->pp_resamplers[0]->input.i_rate -= 1; /* Hz */
} }
/* Check if everything is back to normal, in which case we can stop the /* Check if everything is back to normal, in which case we can stop the
...@@ -467,8 +467,10 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, ...@@ -467,8 +467,10 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
p_input->input.i_rate ) p_input->input.i_rate )
{ {
p_input->i_resampling_type = AOUT_RESAMPLING_NONE; p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
msg_Warn( p_aout, "resampling stopped after "I64Fi" usec", msg_Warn( p_aout, "resampling stopped after "I64Fi" usec "
mdate() - p_input->i_resamp_start_date ); "(drift: "I64Fi")",
mdate() - p_input->i_resamp_start_date,
p_buffer->start_date - start_date);
} }
else if( abs( (int)(p_buffer->start_date - start_date) ) < else if( abs( (int)(p_buffer->start_date - start_date) ) <
abs( p_input->i_resamp_start_drift ) / 2 ) abs( p_input->i_resamp_start_drift ) / 2 )
......
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