X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_filter%2Fresampler%2Fugly.c;h=a1a46cf3bb94c63251e08df9067f61281d964f04;hb=ce25160047afad70eec41daab74dd26d16e9b92b;hp=059d0074c0e14a45225bc237486fc6205ed6eb4a;hpb=78d87996ccb92d1dc91c9987685f976ed3be08a6;p=vlc

diff --git a/modules/audio_filter/resampler/ugly.c b/modules/audio_filter/resampler/ugly.c
index 059d0074c0..a1a46cf3bb 100644
--- a/modules/audio_filter/resampler/ugly.c
+++ b/modules/audio_filter/resampler/ugly.c
@@ -32,14 +32,14 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
+#include <vlc_filter.h>
 
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
 static int  Create    ( vlc_object_t * );
 
-static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
-                        aout_buffer_t * );
+static block_t *DoWork( filter_t *, block_t * );
 
 /*****************************************************************************
  * Module descriptor
@@ -57,75 +57,73 @@ vlc_module_end ()
  *****************************************************************************/
 static int Create( vlc_object_t *p_this )
 {
-    aout_filter_t * p_filter = (aout_filter_t *)p_this;
-
-    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_physical_channels
-              != p_filter->output.i_physical_channels
-          || p_filter->input.i_original_channels
-              != p_filter->output.i_original_channels
-          || (p_filter->input.i_format != VLC_CODEC_FL32
-               && p_filter->input.i_format != VLC_CODEC_FI32) )
+    filter_t * p_filter = (filter_t *)p_this;
+
+    if ( p_filter->fmt_in.audio.i_rate == p_filter->fmt_out.audio.i_rate
+          || p_filter->fmt_in.audio.i_format != p_filter->fmt_out.audio.i_format
+          || p_filter->fmt_in.audio.i_physical_channels
+              != p_filter->fmt_out.audio.i_physical_channels
+          || p_filter->fmt_in.audio.i_original_channels
+              != p_filter->fmt_out.audio.i_original_channels
+          || (p_filter->fmt_in.audio.i_format != VLC_CODEC_FL32
+               && p_filter->fmt_in.audio.i_format != VLC_CODEC_FI32) )
     {
         return VLC_EGENERIC;
     }
 
-    p_filter->pf_do_work = DoWork;
-
-    /* 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 = true;
-
+    p_filter->pf_audio_filter = DoWork;
     return VLC_SUCCESS;
 }
 
 /*****************************************************************************
  * DoWork: convert a buffer
  *****************************************************************************/
-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 )
+static block_t *DoWork( filter_t * p_filter, block_t * p_in_buf )
 {
-    int32_t *p_out = (int32_t*)p_out_buf->p_buffer;
+    /* Check if we really need to run the resampler */
+    if( p_filter->fmt_out.audio.i_rate == p_filter->fmt_in.audio.i_rate )
+        return p_in_buf;
 
-    unsigned int i_nb_channels = aout_FormatNbChannels( &p_filter->input );
-    unsigned int i_in_nb = p_in_buf->i_nb_samples;
-    unsigned int i_out_nb = i_in_nb * p_filter->output.i_rate
-                                    / p_filter->input.i_rate;
-    unsigned int i_sample_bytes = i_nb_channels * sizeof(int32_t);
-    unsigned int i_out, i_chan, i_remainder = 0;
+    block_t *p_out_buf = p_in_buf;
+    unsigned int i_out_nb = p_in_buf->i_nb_samples
+        * p_filter->fmt_out.audio.i_rate / p_filter->fmt_in.audio.i_rate;
+    const unsigned int i_sample_bytes =
+        aout_FormatNbChannels( &p_filter->fmt_in.audio ) * sizeof(int32_t);
 
-    /* Check if we really need to run the resampler */
-    if( p_aout->mixer.mixer.i_rate == p_filter->input.i_rate )
+    if( p_filter->fmt_out.audio.i_rate > p_filter->fmt_in.audio.i_rate )
     {
-        return;
+        p_out_buf = block_Alloc( i_out_nb * i_sample_bytes );
+        if( !p_out_buf )
+            goto out;
     }
 
-    int32_t p_in_orig[p_in_buf->i_nb_bytes / sizeof(int32_t)],
-           *p_in = p_in_orig;
+    unsigned char *p_out = p_out_buf->p_buffer;
+    unsigned char *p_in = p_in_buf->p_buffer;
+    unsigned int i_remainder = 0;
 
-    vlc_memcpy( p_in, p_in_buf->p_buffer, p_in_buf->i_nb_bytes );
+    p_out_buf->i_nb_samples = i_out_nb;
+    p_out_buf->i_buffer = i_out_nb * i_sample_bytes;
+    p_out_buf->i_pts = p_in_buf->i_pts;
+    p_out_buf->i_length = p_out_buf->i_nb_samples *
+        1000000 / p_filter->fmt_out.audio.i_rate;
 
-    for( i_out = i_out_nb ; i_out-- ; )
+    while( i_out_nb )
     {
-        for( i_chan = i_nb_channels ; i_chan ; )
-        {
-            i_chan--;
-            p_out[i_chan] = p_in[i_chan];
-        }
-        p_out += i_nb_channels;
+        if( p_out != p_in )
+            memcpy( p_out, p_in, i_sample_bytes );
+        p_out += i_sample_bytes;
+        i_out_nb--;
 
-        i_remainder += p_filter->input.i_rate;
-        while( i_remainder >= p_filter->output.i_rate )
+        i_remainder += p_filter->fmt_in.audio.i_rate;
+        while( i_remainder >= p_filter->fmt_out.audio.i_rate )
         {
-            p_in += i_nb_channels;
-            i_remainder -= p_filter->output.i_rate;
+            p_in += i_sample_bytes;
+            i_remainder -= p_filter->fmt_out.audio.i_rate;
         }
     }
 
-    p_out_buf->i_nb_samples = i_out_nb;
-    p_out_buf->i_nb_bytes = i_out_nb * i_sample_bytes;
-    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;
+    if( p_in_buf != p_out_buf )
+out:
+        block_Release( p_in_buf );
+    return p_out_buf;
 }