Changeset 2c93e8563e99c72f3dae36226a6e8f46441cd93e

Timestamp:

18/03/05 00:34:04 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1111102444 +0000

git-parent:

[d680724364fbd1222282d1e9c5d8d0c16f171cf1]

git-author:

Gildas Bazin <gbazin@videolan.org> 1111102444 +0000

Message:

* modules/audio_filter/resampler/linear.c: ported linear resampler to audio filter 2 architecture. Patch courtesy of Matthew Hodgson (matthew at mxtelecom dot com) + cleanup and fixes by me.

Files:

• modules/audio_filter/resampler/linear.c (modified) (14 diffs)

modules/audio_filter/resampler/linear.c

@@ -32 +32 @@
-#include "audio_output.h"
-#include "aout_internal.h"
+#include "vlc_filter.h"
+#include "vlc_block.h"
-
-/*****************************************************************************
@@ -41 +43 @@
-                        aout_buffer_t * );
-
+static int  OpenFilter ( vlc_object_t * );
+static void CloseFilter( vlc_object_t * );
+static block_t *Resample( filter_t *, block_t * );
+
-/*****************************************************************************
- * Local structures
- *****************************************************************************/
-aout_
+
-{
-    int32_t *p_prev_sample;       /* this filter introduces a 1 sample delay */
@@ -62 +68 @@
-    set_capability( "audio filter", 5 );
-    set_callbacks( Create, Close );
+
+    add_submodule();
+    set_description( _("audio filter for linear interpolation resampling") );
+    set_capability( "audio filter2", 5 );
+    set_callbacks( OpenFilter, CloseFilter );
-vlc_module_end();
-
@@ -70 +81 @@
-{
-    aout_filter_t * p_filter = (aout_filter_t *)p_this;
+    struct filter_sys_t * p_sys;
+    
-    if ( p_filter->input.i_rate == p_filter->output.i_rate
-          || p_filter->input.i_format != p_filter->output.i_format
@@ -82 +95 @@
-
-    /* Allocate the memory needed to store the module's structure */
-
-
+
+
+
-    {
-        msg_Err( p_filter, "out of memory" );
-        return VLC_ENOMEM;
-    }
-filter->p_
+
-        aout_FormatNbChannels( &p_filter->input ) * sizeof(int32_t) );
-filter->p_
+
-    {
-        msg_Err( p_filter, "out of memory" );
@@ -111 +125 @@
-{
-    aout_filter_t * p_filter = (aout_filter_t *)p_this;
-
-
+
+
+
+
-}
-
@@ -121 +137 @@
-                    aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
-{
+    filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
-    float *p_in_orig, *p_in, *p_out = (float *)p_out_buf->p_buffer;
-filter->p_
+
-
-    int i_nb_channels = aout_FormatNbChannels( &p_filter->input );
@@ -161 +178 @@
-    {
-        p_filter->b_continuity = VLC_TRUE;
-filter->p_
-filter->p_
+
+
-    }
-    else
-    {
-filter->p_
+
-        {
-            for( i_chan = i_nb_channels ; i_chan ; )
@@ -173 +190 @@
-                p_out[i_chan] = p_prev_sample[i_chan];
-                p_out[i_chan] += ( (p_prev_sample[i_chan] - p_in[i_chan])
-filter->p_
+
-                                   / p_filter->output.i_rate );
-            }
@@ -179 +196 @@
-              i_out++;
-
-filter->p_
+
-        }
-filter->p_
+
-    }
-
@@ -187 +204 @@
-    for( i_in = 0; i_in < i_in_nb - 1; i_in++ )
-    {
-filter->p_
+
-        {
-            for( i_chan = i_nb_channels ; i_chan ; )
@@ -195 +212 @@
-                p_out[i_chan] += ( (p_in[i_chan] -
-                    p_in[i_chan + i_nb_channels])
-filter->p_
+
-            }
-            p_out += i_nb_channels;
-              i_out++;
-
-filter->p_
+
-        }
-
-        p_in += i_nb_channels;
-filter->p_
+
-    }
-
@@ -218 +235 @@
-
-    if( p_in_buf->start_date !=
-filter->p_
-
-filter->p_
-
-
-filter->p_
+
+
+
+
+
+
-                                              p_out_buf->i_nb_samples );
-
@@ -234 +251 @@
-
-}
+
+/*****************************************************************************
+ * OpenFilter:
+ *****************************************************************************/
+static int OpenFilter( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t *)p_this;
+    filter_sys_t *p_sys;
+    int i_out_rate  = p_filter->fmt_out.audio.i_rate;
+
+    if( p_filter->fmt_in.audio.i_rate == p_filter->fmt_out.audio.i_rate ||
+        p_filter->fmt_in.i_codec != VLC_FOURCC('f','l','3','2') )
+    {
+        return VLC_EGENERIC;
+    }
+    
+    /* Allocate the memory needed to store the module's structure */
+    p_filter->p_sys = p_sys = malloc( sizeof(struct filter_sys_t) );
+    if( p_sys == NULL )
+    {
+        msg_Err( p_filter, "out of memory" );
+        return VLC_ENOMEM;
+    }
+
+    p_sys->p_prev_sample = malloc(
+        p_filter->fmt_in.audio.i_channels * sizeof(int32_t) );
+    if( p_sys->p_prev_sample == NULL )
+    {
+        msg_Err( p_filter, "out of memory" );
+        free( p_sys );
+        return VLC_ENOMEM;
+    }
+
+    p_filter->pf_audio_filter = Resample;
+
+    msg_Dbg( p_this, "%4.4s/%iKHz/%i->%4.4s/%iKHz/%i",
+             (char *)&p_filter->fmt_in.i_codec,
+             p_filter->fmt_in.audio.i_rate,
+             p_filter->fmt_in.audio.i_channels,
+             (char *)&p_filter->fmt_out.i_codec,
+             p_filter->fmt_out.audio.i_rate,
+             p_filter->fmt_out.audio.i_channels);
+
+    p_filter->fmt_out = p_filter->fmt_in;
+    p_filter->fmt_out.audio.i_rate = i_out_rate;
+
+    return 0;
+}
+
+/*****************************************************************************
+ * CloseFilter : deallocate data structures
+ *****************************************************************************/
+static void CloseFilter( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t *)p_this;
+    free( p_filter->p_sys->p_prev_sample );
+    free( p_filter->p_sys );
+}
+
+/*****************************************************************************
+ * Resample
+ *****************************************************************************/
+static block_t *Resample( filter_t *p_filter, block_t *p_block )
+{
+    aout_filter_t aout_filter;
+    aout_buffer_t in_buf, out_buf;
+    block_t *p_out;
+    int i_out_size;
+    int i_bytes_per_frame;
+
+    if( !p_block || !p_block->i_samples )
+    {
+        if( p_block ) p_block->pf_release( p_block );
+        return NULL;
+    }
+    
+    i_bytes_per_frame = p_filter->fmt_out.audio.i_channels *
+                  p_filter->fmt_out.audio.i_bitspersample / 8;
+    
+    i_out_size = i_bytes_per_frame * ( 1 + (p_block->i_samples * 
+        p_filter->fmt_out.audio.i_rate / p_filter->fmt_in.audio.i_rate));
+
+    p_out = p_filter->pf_audio_buffer_new( p_filter, i_out_size );
+    if( !p_out )
+    {
+        msg_Warn( p_filter, "can't get output buffer" );
+        p_block->pf_release( p_block );
+        return NULL;
+    }
+
+    p_out->i_samples = i_out_size / i_bytes_per_frame;
+    p_out->i_dts = p_block->i_dts;
+    p_out->i_pts = p_block->i_pts;
+    p_out->i_length = p_block->i_length;
+
+    aout_filter.p_sys = (struct aout_filter_sys_t *)p_filter->p_sys;
+    aout_filter.input = p_filter->fmt_in.audio;
+    aout_filter.output = p_filter->fmt_out.audio;
+    aout_filter.b_continuity = VLC_FALSE;
+
+    in_buf.p_buffer = p_block->p_buffer;
+    in_buf.i_nb_bytes = p_block->i_buffer;
+    in_buf.i_nb_samples = p_block->i_samples;
+    out_buf.p_buffer = p_out->p_buffer;
+    out_buf.i_nb_bytes = p_out->i_buffer;
+    out_buf.i_nb_samples = p_out->i_samples;
+
+    DoWork( (aout_instance_t *)p_filter, &aout_filter, &in_buf, &out_buf );
+
+    p_block->pf_release( p_block );
+    
+    p_out->i_buffer = out_buf.i_nb_bytes;
+    p_out->i_samples = out_buf.i_nb_samples;
+
+    return p_out;
+}