Changeset e8da76c97ff90125ef5637045408fc2b81e27839

Timestamp:

12/07/06 21:10:55 (2 years ago)

Author:

Benjamin Pracht <bigben@videolan.org>

git-committer:

Benjamin Pracht <bigben@videolan.org> 1165522255 +0000

git-parent:

[718c752ff05d5bb9f8f499e18e7f5c9c869c6cf8]

git-author:

Benjamin Pracht <bigben@videolan.org> 1165522255 +0000

Message:

* Cleanup that file a bit

Files:

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

modules/audio_filter/resampler/linear.c

@@ -31 +31 @@
-#include <vlc/vlc.h>
-#include <vlc_aout.h>
-
-#include <vlc_filter.h>
-#include <vlc_block.h>
@@ -42 +41 @@
-static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
-                        aout_buffer_t * );
-static void DoWork_inner( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
-                        aout_buffer_t *, int );
-
-static int  OpenFilter ( vlc_object_t * );
@@ -84 +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
@@ -112 +109 @@
-    }
-
-    memset( p_sys->p_prev_sample, 0, aout_FormatNbChannels( &p_filter->input ) * sizeof(int32_t) );
-
-    p_filter->pf_do_work = DoWork;
-
@@ -130 +125 @@
-    aout_filter_t * p_filter = (aout_filter_t *)p_this;
-    filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
-
+
-    free( p_sys->p_prev_sample );
-    free( p_sys );
@@ -140 +135 @@
-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 )
-{
-    DoWork_inner( p_aout, p_filter, p_in_buf, p_out_buf, p_aout->mixer.mixer.i_rate );
-}
-
-static void DoWork_inner( aout_instance_t * p_aout, aout_filter_t * p_filter,
-                    aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf,
-                    int i_output_rate )
-{
-    filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
@@ -159 +147 @@
-    int i_chan, i_in, i_out = 0;
-
-
-    /* Check if we really need to run the resampler */
-
-
+
-    {
-        if( p_filter->b_continuity &&
@@ -282 +268 @@
-        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) );
@@ -299 +285 @@
-        return VLC_ENOMEM;
-    }
-
-    memset( p_sys->p_prev_sample, 0, p_filter->fmt_in.audio.i_channels * sizeof(int32_t) );
-
-    p_filter->pf_audio_filter = Resample;
@@ -344 +328 @@
-        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));
@@ -376 +360 @@
-    out_buf.i_nb_samples = p_out->i_samples;
-
-
-
+
-
-    p_block->pf_release( p_block );
-
+
-    p_out->i_buffer = out_buf.i_nb_bytes;
-    p_out->i_samples = out_buf.i_nb_samples;