X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_filter%2Fresampler%2Fbandlimited.c;h=58dad6ca4d313ea2468c669795f103951e258f07;hb=13ae40b0efc4f1b1ce205d9a057537047fcab3f4;hp=bab1cc6134e3041c61b329fcef94fb0d4a9be0b9;hpb=70a8bb9649c3e44350d0fd579c24b8a9ddd7af34;p=vlc

diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c
index bab1cc6134..58dad6ca4d 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,10 +32,13 @@
  * filter is 13 samples.
  *
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_aout.h>
 
 #include "bandlimited.h"
@@ -81,7 +84,7 @@ struct aout_filter_sys_t
 vlc_module_begin();
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_MISC );
-    set_description( _("Audio filter for band-limited interpolation resampling") );
+    set_description( N_("Audio filter for band-limited interpolation resampling") );
     set_capability( "audio filter", 20 );
     set_callbacks( Create, Close );
 vlc_module_end();
@@ -142,7 +145,7 @@ static int Create( vlc_object_t *p_this )
 
     /* We don't want a new buffer to be created because we're not sure we'll
      * actually need to resample anything. */
-    p_filter->b_in_place = VLC_TRUE;
+    p_filter->b_in_place = true;
 
     return VLC_SUCCESS;
 }
@@ -203,7 +206,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
             p_out_buf->i_nb_bytes = p_out_buf->i_nb_samples *
                 p_filter->input.i_bytes_per_frame;
         }
-        p_filter->b_continuity = VLC_FALSE;
+        p_filter->b_continuity = false;
         p_filter->p_sys->i_old_wing = 0;
         return;
     }
@@ -212,7 +215,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     {
         /* Continuity in sound samples has been broken, we'd better reset
          * everything. */
-        p_filter->b_continuity = VLC_TRUE;
+        p_filter->b_continuity = true;
         p_filter->p_sys->i_remainder = 0;
         aout_DateInit( &p_filter->p_sys->end_date, p_filter->output.i_rate );
         aout_DateSet( &p_filter->p_sys->end_date, p_in_buf->start_date );
@@ -244,14 +247,13 @@ 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_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 );
+        vlc_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_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 );
+    vlc_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 );
 
     /* Make sure the output buffer is reset */
     memset( p_out, 0, p_out_buf->i_size );
@@ -274,7 +276,7 @@ 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, 
+            memcpy( p_out, p_in,
                     p_filter->input.i_bytes_per_frame );
             p_in += i_nb_channels;
             p_out += i_nb_channels;