./ChangeLog: added entry for the linear resampler

 ./modules/audio_filter/resampler/linear.c: This should allways generate the
right number of samples now. The morale is never base your floating point
calculations on the output of integer divitions.

diff --git a/ChangeLog b/ChangeLog
index 937444467eec9d240ede6facd132d5baf11ff033..a1b4d099416dbe944a19a4e9269d0a129d1e7e9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 0.5.0
 Not released yet
 
+  * ./modules/audio_filter/resampler/linear.c: new audio resampler based on
+    linear interpolation
   * ./modules/gui/macosx/prefs.m: new configuration interface
   * ./src/misc/netutils.c: GetMacAddress Darwin support
   * ./src/libvlc.h: default to en0 instead of eth0 under Darwin

diff --git a/modules/audio_filter/resampler/linear.c b/modules/audio_filter/resampler/linear.c
index 69df2d04b5ac28894d88c34b90ad4192674d7f43..122e7e1b8ed6b7f41bfc281f19e1ccfdcc14081d 100644 (file)
--- a/modules/audio_filter/resampler/linear.c
+++ b/modules/audio_filter/resampler/linear.c
@@ -2,7 +2,7 @@
  * ugly.c : linear interpolation resampler
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: linear.c,v 1.1 2002/11/07 21:09:59 sigmunau Exp $
+ * $Id: linear.c,v 1.2 2002/11/10 13:24:35 sigmunau Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -55,7 +55,6 @@ vlc_module_end();
 static int Create( vlc_object_t *p_this )
 {
     aout_filter_t * p_filter = (aout_filter_t *)p_this;
-    msg_Dbg( p_this, " trying the linear resampler");
     if ( p_filter->input.i_rate == p_filter->output.i_rate
           || p_filter->input.i_format != p_filter->output.i_format
           || p_filter->input.i_channels != p_filter->output.i_channels
@@ -85,12 +84,13 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
                     / p_filter->input.i_rate;
     int i_frame_bytes = i_nb_channels * sizeof(s32);
     int i_in, i_chan, i_out = 0;
-    double f_step = (float)i_in_nb/i_out_nb;
+    double f_step = (float)p_filter->input.i_rate / p_filter->output.i_rate;
     float f_pos = 1;
+    
     for( i_in = 0 ; i_in < i_in_nb - 1; i_in++ )
     {
         f_pos--;
-        while( f_pos < 1 )
+        while( f_pos <= 1 )
         {
             for( i_chan = i_nb_channels ; i_chan ; )
             {
@@ -104,16 +104,11 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
         }
         p_in += i_nb_channels;
     }
-    if ( f_step < 1 ) {
-        for( i_chan = i_nb_channels ; i_chan ; )
-        {
-            i_chan--;
-            p_out[i_chan] = p_in[i_chan];
-            i_out++;
-        }
-    }
-    if ( i_out != i_out_nb * i_nb_channels ) {
-        msg_Warn( p_aout, "mismatch in sample nubers: %d requested, %d generated", i_out_nb* i_nb_channels, i_out);
+    
+    if ( i_out != i_out_nb * i_nb_channels )
+    {
+        msg_Warn( p_aout, "mismatch in sample numbers: %d requested, "
+                  "%d generated", i_out_nb* i_nb_channels, i_out);
     }
                                               
     p_out_buf->i_nb_samples = i_out_nb;