Fixed a nasty memleak in ugly and linear resamplers when alloca is

unavaliable. Also swaped the score of these modules.

diff --git a/modules/audio_filter/resampler/linear.c b/modules/audio_filter/resampler/linear.c
index bdb7d44c0ab56d48734bf1212f9268807433b226..f8e5e2f81f2dcffe9709563e1886ca4c014ca216 100644 (file)
--- a/modules/audio_filter/resampler/linear.c
+++ b/modules/audio_filter/resampler/linear.c
@@ -2,7 +2,7 @@
  * linear.c : linear interpolation resampler
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: linear.c,v 1.11 2003/12/22 14:32:55 sam Exp $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *          Sigmund Augdal <sigmunau@idi.ntnu.no>
@@ -57,7 +57,7 @@ struct aout_filter_sys_t
  *****************************************************************************/
 vlc_module_begin();
     set_description( _("audio filter for linear interpolation resampling") );
-    set_capability( "audio filter", 2 );
+    set_capability( "audio filter", 5 );
     set_callbacks( Create, Close );
 vlc_module_end();
 
@@ -118,7 +118,7 @@ static void Close( vlc_object_t * p_this )
 static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
                     aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
 {
-    float *p_in, *p_out = (float *)p_out_buf->p_buffer;
+    float *p_in_orig, *p_in, *p_out = (float *)p_out_buf->p_buffer;
     float *p_prev_sample = (float *)p_filter->p_sys->p_prev_sample;
 
     int i_nb_channels = aout_FormatNbChannels( &p_filter->input );
@@ -145,7 +145,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
 #ifdef HAVE_ALLOCA
     p_in = (float *)alloca( p_in_buf->i_nb_bytes );
 #else
-    p_in = (float *)malloc( p_in_buf->i_nb_bytes );
+    p_in_orig = p_in = (float *)malloc( p_in_buf->i_nb_bytes );
 #endif
     if( p_in == NULL )
     {
@@ -226,4 +226,8 @@ 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 *
         i_nb_channels * sizeof(int32_t);
 
+#ifndef HAVE_ALLOCA
+    free( p_in_orig );
+#endif
+
 }

diff --git a/modules/audio_filter/resampler/ugly.c b/modules/audio_filter/resampler/ugly.c
index b703180b8a0fc3dc0e43a75045c48c9d46f0bcd3..5b091887d15c1e5365a820b16101dae599968361 100644 (file)
--- a/modules/audio_filter/resampler/ugly.c
+++ b/modules/audio_filter/resampler/ugly.c
@@ -2,7 +2,7 @@
  * ugly.c : ugly resampler (changes pitch)
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: ugly.c,v 1.9 2003/03/04 03:27:40 gbazin Exp $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -44,7 +44,7 @@ static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
  *****************************************************************************/
 vlc_module_begin();
     set_description( _("audio filter for ugly resampling") );
-    set_capability( "audio filter", 5 );
+    set_capability( "audio filter", 2 );
     set_callbacks( Create, NULL );
 vlc_module_end();
 
@@ -82,7 +82,7 @@ static int Create( vlc_object_t *p_this )
 static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
                     aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
 {
-    int32_t *p_in, *p_out = (int32_t*)p_out_buf->p_buffer;
+    int32_t *p_in_orig, *p_in, *p_out = (int32_t*)p_out_buf->p_buffer;
 
     unsigned int i_nb_channels = aout_FormatNbChannels( &p_filter->input );
     unsigned int i_in_nb = p_in_buf->i_nb_samples;
@@ -100,7 +100,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
 #ifdef HAVE_ALLOCA
     p_in = (int32_t *)alloca( p_in_buf->i_nb_bytes );
 #else
-    p_in = (int32_t *)malloc( p_in_buf->i_nb_bytes );
+    p_in_orig = p_in = (int32_t *)malloc( p_in_buf->i_nb_bytes );
 #endif
     if( p_in == NULL )
     {
@@ -131,4 +131,9 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     p_out_buf->start_date = p_in_buf->start_date;
     p_out_buf->end_date = p_out_buf->start_date + p_out_buf->i_nb_samples *
         1000000 / p_filter->output.i_rate;
+
+#ifndef HAVE_ALLOCA
+    free( p_in_orig );
+#endif
+
 }