Changeset 10e3212ea54875dd09bc3ac36bd31b7f795a1cb8

Timestamp:

22/08/06 16:31:40 (2 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1156257100 +0000

git-parent:

[63fa138598d47f1e75e7065a03952e00be6d4780]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1156257100 +0000

Message:

Downmix stereo to mono channel and choose with --sout-mono-channel <n> the destination channel.

Files:

• modules/audio_filter/converter/mono.c (modified) (11 diffs)

modules/audio_filter/converter/mono.c

@@ -52 +52 @@
-
-static block_t *Convert( filter_t *p_filter, block_t *p_block );
-
-
-
-
-
-
+
+
+
-
-/*****************************************************************************
@@ -64 +61 @@
-struct filter_sys_t
-{
-    vlc_bool_t b_block_channel;
-    int i_nb_channels; /* number of float32 per sample */
-    unsigned int i_channel_selected;
@@ -119 +115 @@
-        (p_filter->fmt_out.i_codec != AOUT_FMT_S16_NE) )
-    {
-invalid format
+filter discarded (invalid format)
-        return -1;
-    }
@@ -145 +141 @@
-            (unsigned int) var_GetInteger( p_this, MONO_CFG "mono-channel" );
-
-
-
-
-
-
+
+
+
+
-                            (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT);
-
-
-
-
-
+
-    p_filter->fmt_out.audio.i_rate = p_filter->fmt_in.audio.i_rate;
-    p_filter->fmt_out.audio.i_format = p_filter->fmt_out.i_codec;
-
-out
+in
-    p_sys->i_bitspersample = p_filter->fmt_out.audio.i_bitspersample;
+
+    p_filter->pf_audio_filter = Convert;
-
-    msg_Dbg( p_this, "%4.4s->%4.4s, channels %d->%d, bits per sample: %i->%i",
@@ -194 +187 @@
-    block_t *p_out = NULL;
-    int i_out_size;
+    unsigned int i_samples;
-
-    if( !p_block || !p_block->i_samples )
@@ -203 +197 @@
-
-    i_out_size = p_block->i_samples * p_filter->p_sys->i_bitspersample/8 *
-p_filter->p_sys->i_nb_channels
+aout_FormatNbChannels( &(p_filter->fmt_out.audio) )
-
-    p_out = p_filter->pf_audio_buffer_new( p_filter, i_out_size );
@@ -213 +207 @@
-    }
-
-
+
+
-    p_out->i_dts = p_block->i_dts;
-    p_out->i_pts = p_block->i_pts;
@@ -229 +224 @@
-
-#if 0
-
-
-
-
-
-
-
+
+
+
+
+
+
-    }
-#endif
@@ -243 +237 @@
-    out_buf.i_nb_samples = p_out->i_samples;
-
-
+
+
-
-    p_out->i_buffer = out_buf.i_nb_bytes;
@@ -252 +247 @@
-}
-
-
-
+
+
+
+
+
-{
-    filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
-
-    if( p_sys->b_block_channel )
-    {
-        silence_channel( p_aout, p_filter, p_out_buf, p_in_buf );
-    }
-    else
-    {
-        unsigned int i_samples;
-
-        i_samples = stereo_to_mono( (int16_t *)p_out_buf->p_buffer, (int16_t *)p_in_buf->p_buffer,
-                                    p_out_buf->i_nb_samples );
-    }
-
-    p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
-}
-
-/* silence_channel - play silence on all channels except the selected one.
- */
-static void silence_channel( aout_instance_t * p_aout, aout_filter_t * p_filter,
-                             aout_buffer_t *p_out_buf, aout_buffer_t *p_in_buf )
-{
-    filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
-    unsigned int n = 0;
-    int16_t *p_in, *p_out;
-
-
-
-
-
+
+
+
+
+
+
-    {
-        if( (n%p_sys->i_nb_channels) == p_sys->i_channel_selected )
-        {
-p_in[n]
+(p_in[n] + p_in[n+1]) >> 1
-        }
-        else
@@ -295 +271 @@
-        }
-    }
-}
-
-/* stereo_to_mono() function is from ffmpeg file libavcodec/resample.c 
- * Copyright (c) 2000 Fabrice Bellard.
- */
-static unsigned int stereo_to_mono( int16_t *p_output, int16_t *p_input,
-                                    unsigned int i_samples )
-{
-    int16_t *p, *q;
-    unsigned int n = i_samples;
-
-    p = p_input;
-    q = p_output;
-
-    while (n >= 4) {
-        q[0] = (p[0] + p[1]) >> 1;
-        q[1] = (p[2] + p[3]) >> 1;
-        q[2] = (p[4] + p[5]) >> 1;
-        q[3] = (p[6] + p[7]) >> 1;
-        q += 4;
-        p += 8;
-        n -= 4;
-    }
-    while (n > 0) {
-        q[0] = (p[0] + p[1]) >> 1;
-        q++;
-        p += 2;
-        n--;
-    }
-    return n;
-}