Improvements to preferences

[vlc] / modules / audio_filter / resampler / bandlimited.c

diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c
index a2ad7bc68e4a218adb3b722521b051d6ea581597..c31a3b8246fea484df8cd2d9f8bf0ded753a9952 100644 (file)
--- a/modules/audio_filter/resampler/bandlimited.c
+++ b/modules/audio_filter/resampler/bandlimited.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * bandlimited.c : bandlimited interpolation resampler
+ * bandlimited.c : band-limited interpolation resampler
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: bandlimited.c,v 1.4 2003/03/05 19:31:32 gbazin Exp $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -24,7 +24,7 @@
 /*****************************************************************************
  * Preamble:
  *
- * This implementation of the bandlimited interpolationis based on the
+ * This implementation of the band-limited interpolationis based on the
  * following paper:
  * http://ccrma-www.stanford.edu/~jos/resample/resample.html
  *
@@ -79,7 +79,9 @@ struct aout_filter_sys_t
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("audio filter for bandlimited interpolation resampling") );
+    set_category( CAT_AUDIO );
+    set_subcategory( SUBCAT_AUDIO_MISC );
+    set_description( _("audio filter for band-limited interpolation resampling") );
     set_capability( "audio filter", 20 );
     set_callbacks( Create, Close );
 vlc_module_end();
@@ -104,6 +106,13 @@ static int Create( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
+#if !defined( SYS_DARWIN )
+    if( !config_GetInt( p_this, "hq-resampling" ) )
+    {
+        return VLC_EGENERIC;
+    }
+#endif
+
     /* Allocate the memory needed to store the module's structure */
     p_filter->p_sys = malloc( sizeof(struct aout_filter_sys_t) );
     if( p_filter->p_sys == NULL )
@@ -128,6 +137,7 @@ static int Create( vlc_object_t *p_this )
         return VLC_ENOMEM;
     }
 
+    p_filter->p_sys->i_old_wing = 0;
     p_filter->pf_do_work = DoWork;
 
     /* We don't want a new buffer to be created because we're not sure we'll
@@ -167,33 +177,34 @@ 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 &&
+        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 + sizeof(float) * i_nb_channels )
+              p_in_buf->i_nb_bytes + p_filter->p_sys->i_old_wing *
+              p_filter->input.i_bytes_per_frame )
         {
-            if( p_filter->p_sys->i_old_wing )
-            {
-                /* output the whole thing with the samples from last time */
-                memmove( ((float *)(p_in_buf->p_buffer)) +
-                         i_nb_channels * p_filter->p_sys->i_old_wing,
-                         p_in_buf->p_buffer, p_in_buf->i_nb_bytes );
-                memcpy( p_in_buf->p_buffer, p_filter->p_sys->p_buf +
-                        i_nb_channels * p_filter->p_sys->i_old_wing,
-                        p_filter->p_sys->i_old_wing *
-                        p_filter->input.i_bytes_per_frame );
-
-                p_out_buf->i_nb_samples = p_in_buf->i_nb_samples +
-                    p_filter->p_sys->i_old_wing;
-
-                p_out_buf->end_date =
-                    aout_DateIncrement( &p_filter->p_sys->end_date,
-                                        p_out_buf->i_nb_samples );
-
-                p_out_buf->i_nb_bytes = p_out_buf->i_nb_samples *
-                    p_filter->input.i_bytes_per_frame;
-            }
+            /* output the whole thing with the samples from last time */
+            memmove( ((float *)(p_in_buf->p_buffer)) +
+                     i_nb_channels * p_filter->p_sys->i_old_wing,
+                     p_in_buf->p_buffer, p_in_buf->i_nb_bytes );
+            memcpy( p_in_buf->p_buffer, p_filter->p_sys->p_buf +
+                    i_nb_channels * p_filter->p_sys->i_old_wing,
+                    p_filter->p_sys->i_old_wing *
+                    p_filter->input.i_bytes_per_frame );
+
+            p_out_buf->i_nb_samples = p_in_buf->i_nb_samples +
+                p_filter->p_sys->i_old_wing;
+
+            p_out_buf->start_date = aout_DateGet( &p_filter->p_sys->end_date );
+            p_out_buf->end_date =
+                aout_DateIncrement( &p_filter->p_sys->end_date,
+                                    p_out_buf->i_nb_samples );
+
+            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->p_sys->i_old_wing = 0;
         return;
     }
 
@@ -263,7 +274,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_buf->p_buffer, p_in, 
+            memcpy( p_out, p_in, 
                     p_filter->input.i_bytes_per_frame );          
             p_in += i_nb_channels;
             p_out += i_nb_channels;
@@ -433,8 +444,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
 
     /* Finalize aout buffer */
     p_out_buf->i_nb_samples = i_out;
-    p_out_buf->start_date = p_in_buf->start_date;
-
+    p_out_buf->start_date = aout_DateGet( &p_filter->p_sys->end_date );
     p_out_buf->end_date = aout_DateIncrement( &p_filter->p_sys->end_date,
                                               p_out_buf->i_nb_samples );