]> git.sesse.net Git - vlc/commitdiff
aout: remove write-only resampling start date
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 7 Nov 2012 16:51:31 +0000 (18:51 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 7 Nov 2012 16:51:31 +0000 (18:51 +0200)
src/audio_output/aout_internal.h
src/audio_output/input.c

index 05901b6a84850a0ff5599eed5f9f922cb7a62392..4146026ce3a7cc12e38a682b406f1b23c1d1bb01 100644 (file)
@@ -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 */
index bdea6adb1f07083530d136f45c90e0dbe54d5bd0..9820854bbcd79487503cb08c420dea45e44fedc3 100644 (file)
@@ -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) ) <