vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Nov 7 18:51:31 2012 +0200| [01de23db5ff3a54329cf0c262dead96fc8d88cff] | committer: Rémi Denis-Courmont
aout: remove write-only resampling start date > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=01de23db5ff3a54329cf0c262dead96fc8d88cff --- src/audio_output/aout_internal.h | 1 - src/audio_output/input.c | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h index 05901b6..4146026 100644 --- a/src/audio_output/aout_internal.h +++ b/src/audio_output/aout_internal.h @@ -52,7 +52,6 @@ struct aout_input_t unsigned samplerate; /**< Input sample rate */ int i_resampling_type; - mtime_t i_resamp_start_date; int i_resamp_start_drift; /* last rate from input */ diff --git a/src/audio_output/input.c b/src/audio_output/input.c index bdea6ad..9820854 100644 --- a/src/audio_output/input.c +++ b/src/audio_output/input.c @@ -178,7 +178,6 @@ block_t *aout_InputPlay(audio_output_t *p_aout, aout_input_t *p_input, * synchronization * 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_resampling_type = (drift < 0) ? AOUT_RESAMPLING_DOWN : AOUT_RESAMPLING_UP; @@ -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 ) { p_input->i_resampling_type = AOUT_RESAMPLING_NONE; - msg_Warn( p_aout, "resampling stopped after %"PRIi64" usec " - "(drift: %"PRIi64")", - now - p_input->i_resamp_start_date, + msg_Warn( p_aout, "resampling stopped (drift: %"PRIi64")", p_buffer->i_pts - start_date); } else if( abs( (int)(p_buffer->i_pts - start_date) ) < _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
