X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Faudio_filter%2Fresampler%2Fbandlimited.c;h=5a5bc99850c9184ad5244650308761b74158fdf0;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=d092f6b06402d943262837aff76bcbddb38ca97d;hpb=8e394d70cd2a16876f85b424473cf109555dae21;p=vlc

diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c
index d092f6b064..5a5bc99850 100644
--- a/modules/audio_filter/resampler/bandlimited.c
+++ b/modules/audio_filter/resampler/bandlimited.c
@@ -10,7 +10,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -32,12 +32,10 @@
  * filter is 13 samples.
  *
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
 #include <vlc/vlc.h>
-#include "audio_output.h"
-#include "aout_internal.h"
+#include <vlc_aout.h>
+
 #include "bandlimited.h"
 
 /*****************************************************************************
@@ -123,7 +121,7 @@ static int Create( vlc_object_t *p_this )
 
     /* Calculate worst case for the length of the filter wing */
     d_factor = (double)p_filter->output.i_rate
-                        / p_filter->input.i_rate;
+                        / p_filter->input.i_rate / AOUT_MAX_INPUT_RATE;
     i_filter_wing = ((SMALL_FILTER_NMULT + 1)/2.0)
                       * __MAX(1.0, 1.0/d_factor) + 10;
     p_filter->p_sys->i_buf_size = aout_FormatNbChannels( &p_filter->input ) *
@@ -177,7 +175,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     /* Check if we really need to run the resampler */
     if( p_aout->mixer.mixer.i_rate == p_filter->input.i_rate )
     {
-        if( //p_filter->b_continuity && /* What difference does it make ? :) */
+        if( /*p_filter->b_continuity && /--* What difference does it make ? :) */
             p_filter->p_sys->i_old_wing &&
             p_in_buf->i_size >=
               p_in_buf->i_nb_bytes + p_filter->p_sys->i_old_wing *
@@ -244,11 +242,11 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     /* Copy all our samples in p_in */
     if( p_filter->p_sys->i_old_wing )
     {
-        p_aout->p_vlc->pf_memcpy( p_in, p_filter->p_sys->p_buf,
+        p_aout->p_libvlc->pf_memcpy( p_in, p_filter->p_sys->p_buf,
                                   p_filter->p_sys->i_old_wing * 2 *
                                   p_filter->input.i_bytes_per_frame );
     }
-    p_aout->p_vlc->pf_memcpy( p_in + p_filter->p_sys->i_old_wing * 2 *
+    p_aout->p_libvlc->pf_memcpy( p_in + p_filter->p_sys->i_old_wing * 2 *
                               i_nb_channels, p_in_buf->p_buffer,
                               p_in_buf->i_nb_samples *
                               p_filter->input.i_bytes_per_frame );
@@ -274,8 +272,8 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
         if( p_filter->p_sys->d_old_factor == 1 )
         {
             /* Just copy the samples */
-            memcpy( p_out, p_in, 
-                    p_filter->input.i_bytes_per_frame );          
+            memcpy( p_out, p_in,
+                    p_filter->input.i_bytes_per_frame );
             p_in += i_nb_channels;
             p_out += i_nb_channels;
             i_out++;