Skip to content

V
vlc-2-2
Commit 01de23db authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

aout: remove write-only resampling start date

parent 87762e62
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
src/audio_output/aout_internal.h
View file @ 01de23db
...@@ -52,7 +52,6 @@ struct aout_input_t ...@@ -52,7 +52,6 @@ struct aout_input_t
unsigned samplerate; /**< Input sample rate */ unsigned samplerate; /**< Input sample rate */
int i_resampling_type; int i_resampling_type;
mtime_t i_resamp_start_date;
int i_resamp_start_drift; int i_resamp_start_drift;
/* last rate from input */ /* last rate from input */
......
src/audio_output/input.c
View file @ 01de23db
...@@ -178,7 +178,6 @@ block_t *aout_InputPlay(audio_output_t *p_aout, aout_input_t *p_input, ...@@ -178,7 +178,6 @@ block_t *aout_InputPlay(audio_output_t *p_aout, aout_input_t *p_input,
* synchronization * synchronization
* Solution : resample the buffer to avoid a scratch. * Solution : resample the buffer to avoid a scratch.
*/ */
p_input->i_resamp_start_date = now;
p_input->i_resamp_start_drift = (int)-drift; p_input->i_resamp_start_drift = (int)-drift;
p_input->i_resampling_type = (drift < 0) ? AOUT_RESAMPLING_DOWN p_input->i_resampling_type = (drift < 0) ? AOUT_RESAMPLING_DOWN
: AOUT_RESAMPLING_UP; : AOUT_RESAMPLING_UP;
...@@ -207,9 +206,7 @@ block_t *aout_InputPlay(audio_output_t *p_aout, aout_input_t *p_input, ...@@ -207,9 +206,7 @@ block_t *aout_InputPlay(audio_output_t *p_aout, aout_input_t *p_input,
if( owner->resampler->fmt_in.audio.i_rate == i_nominal_rate ) if( owner->resampler->fmt_in.audio.i_rate == i_nominal_rate )
{ {
p_input->i_resampling_type = AOUT_RESAMPLING_NONE; p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
msg_Warn( p_aout, "resampling stopped after %"PRIi64" usec " msg_Warn( p_aout, "resampling stopped (drift: %"PRIi64")",
"(drift: %"PRIi64")",
now - p_input->i_resamp_start_date,
p_buffer->i_pts - start_date); p_buffer->i_pts - start_date);
} }
else if( abs( (int)(p_buffer->i_pts - start_date) ) < else if( abs( (int)(p_buffer->i_pts - start_date) ) <
......
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