Changeset f94dbb3eaeef0ca764fe9cd029da79cab45be7ca

Timestamp:

11/20/06 06:09:23 (2 years ago)

Author:

Benjamin Pracht <bigben@videolan.org>

git-committer:

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

git-parent:

[6a42724746cf15ac038540451a04f62bca3b5629]

git-author:

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

Message:

* Quick fix when transcoding and resampling mono audio tracks.
* The transcode module should be reviewed: all the the fields in p
_enc->fmt_in are not set, it seems

Files:

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

modules/audio_filter/resampler/linear.c

@@ -42 +42 @@
-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 * );
@@ -103 +105 @@
-    }
-    p_sys->p_prev_sample = malloc(
-aout_FormatNbChannels( &p_filter->input )
+p_filter->input.i_channels
-    if( p_sys->p_prev_sample == NULL )
-    {
@@ -109 +111 @@
-        return VLC_ENOMEM;
-    }
+
+    memset( p_sys->p_prev_sample, 0, aout_FormatNbChannels( &p_filter->input ) * sizeof(int32_t) );
-
-    p_filter->pf_do_work = DoWork;
@@ -136 +140 @@
-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;
@@ -144 +155 @@
-    float *p_prev_sample = (float *)p_sys->p_prev_sample;
-
-aout_FormatNbChannels( &p_filter->input )
+p_filter->input.i_channels
-    int i_in_nb = p_in_buf->i_nb_samples;
-    int i_chan, i_in, i_out = 0;
-
+
-    /* Check if we really need to run the resampler */
-
+
+
-    {
-        if( p_filter->b_continuity &&
@@ -287 +300 @@
-    }
-
+    memset( p_sys->p_prev_sample, 0, p_filter->fmt_in.audio.i_channels * sizeof(int32_t) );
+
-    p_filter->pf_audio_filter = Resample;
-
@@ -361 +376 @@
-    out_buf.i_nb_samples = p_out->i_samples;
-
-
+
+
-
-    p_block->pf_release( p_block );