X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Finput.c;h=e78c49b8b090e54cf04fad70c6487d077c2b6b11;hb=5f2b369ce56dd68a3278022bdc3e97518d140a7e;hp=5cfec8c9402da95a00f331cbf58575eaafb60c12;hpb=1b72149a5607d46b56a84f48e16a9adde10c8e63;p=vlc

diff --git a/src/audio_output/input.c b/src/audio_output/input.c
index 5cfec8c940..e78c49b8b0 100644
--- a/src/audio_output/input.c
+++ b/src/audio_output/input.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -246,7 +246,9 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
             }
 
             /* Create a VLC object */
-            p_filter = vlc_object_create( p_aout, sizeof(aout_filter_t) );
+            static const char typename[] = "audio filter";
+            p_filter = vlc_custom_create( p_aout, sizeof(*p_filter),
+                                          VLC_OBJECT_GENERIC, typename );
             if( p_filter == NULL )
             {
                 msg_Err( p_aout, "cannot add user filter %s (skipped)",
@@ -401,6 +403,21 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
     }
     p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
 
+    p_input->p_playback_rate_filter = NULL;
+    for( int i = 0; i < p_input->i_nb_filters; i++ )
+    {
+        aout_filter_t *p_filter = p_input->pp_filters[i];
+        if( strcmp( "scaletempo", p_filter->psz_object_name ) == 0 )
+        {
+          p_input->p_playback_rate_filter = p_filter;
+          break;
+        }
+    }
+    if( ! p_input->p_playback_rate_filter && p_input->i_nb_resamplers > 0 )
+    {
+        p_input->p_playback_rate_filter = p_input->pp_resamplers[0];
+    }
+
     aout_FiltersHintBuffers( p_aout, p_input->pp_filters,
                              p_input->i_nb_filters,
                              &p_input->input_alloc );
@@ -475,7 +492,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
         vlc_mutex_unlock( &p_aout->mixer_lock );
     }
 
-    if( i_input_rate != INPUT_RATE_DEFAULT && p_input->i_nb_resamplers <= 0 )
+    if( i_input_rate != INPUT_RATE_DEFAULT && p_input->p_playback_rate_filter == NULL )
     {
         inputDrop( p_aout, p_input, p_buffer );
         return 0;
@@ -502,10 +519,10 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
     }
 #endif
 
-    /* Handle input rate change by modifying resampler input rate */
+    /* Handle input rate change, but keep drift correction */
     if( i_input_rate != p_input->i_last_input_rate )
     {
-        unsigned int * const pi_rate = &p_input->pp_resamplers[0]->input.i_rate;
+        unsigned int * const pi_rate = &p_input->p_playback_rate_filter->input.i_rate;
 #define F(r,ir) ( INPUT_RATE_DEFAULT * (r) / (ir) )
         const int i_delta = *pi_rate - F(p_input->input.i_rate,p_input->i_last_input_rate);
         *pi_rate = F(p_input->input.i_rate + i_delta, i_input_rate);
@@ -551,8 +568,9 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
 
     /* If the audio drift is too big then it's not worth trying to resample
      * the audio. */
+    mtime_t i_pts_tolerance = 3 * AOUT_PTS_TOLERANCE * i_input_rate / INPUT_RATE_DEFAULT;
     if ( start_date != 0 &&
-         ( start_date < p_buffer->start_date - 3 * AOUT_PTS_TOLERANCE ) )
+         ( start_date < p_buffer->start_date - i_pts_tolerance ) )
     {
         msg_Warn( p_aout, "audio drift is too big (%"PRId64"), clearing out",
                   start_date - p_buffer->start_date );
@@ -566,7 +584,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
         start_date = 0;
     }
     else if ( start_date != 0 &&
-              ( start_date > p_buffer->start_date + 3 * AOUT_PTS_TOLERANCE ) )
+              ( start_date > p_buffer->start_date + i_pts_tolerance) )
     {
         msg_Warn( p_aout, "audio drift is too big (%"PRId64"), dropping buffer",
                   start_date - p_buffer->start_date );
@@ -629,7 +647,11 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
 
         /* Check if everything is back to normal, in which case we can stop the
          * resampling */
-        if( p_input->pp_resamplers[0]->input.i_rate == 1000 * p_input->input.i_rate / i_input_rate )
+        unsigned int i_nominal_rate =
+          (p_input->pp_resamplers[0] == p_input->p_playback_rate_filter)
+          ? INPUT_RATE_DEFAULT * p_input->input.i_rate / i_input_rate
+          : p_input->input.i_rate;
+        if( p_input->pp_resamplers[0]->input.i_rate == i_nominal_rate )
         {
             p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
             msg_Warn( p_aout, "resampling stopped after %"PRIi64" usec "
@@ -733,8 +755,10 @@ static void inputResamplingStop( aout_input_t *p_input )
     p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
     if( p_input->i_nb_resamplers != 0 )
     {
-        p_input->pp_resamplers[0]->input.i_rate = INPUT_RATE_DEFAULT *
-                            p_input->input.i_rate / p_input->i_last_input_rate;
+        p_input->pp_resamplers[0]->input.i_rate =
+            ( p_input->pp_resamplers[0] == p_input->p_playback_rate_filter )
+            ? INPUT_RATE_DEFAULT * p_input->input.i_rate / p_input->i_last_input_rate
+            : p_input->input.i_rate;
         p_input->pp_resamplers[0]->b_continuity = false;
     }
 }