Changeset 128f5ba7b25efb7d218df9c4da139c9a2462b39d

Timestamp:

22/01/03 19:31:47 (6 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1043260307 +0000

git-parent:

[dba1461123a88cb8840f11927e0adcaa76befe52]

git-author:

Christophe Massiot <massiot@videolan.org> 1043260307 +0000

Message:

Reverse stereo option.

Files:

• include/audio_output.h (modified) (2 diffs)
• modules/audio_filter/channel_mixer/trivial.c (modified) (2 diffs)
• modules/audio_filter/converter/a52tofloat32.c (modified) (3 diffs)
• src/audio_output/common.c (modified) (2 diffs)
• src/audio_output/output.c (modified) (4 diffs)

include/audio_output.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-4 2002/12/07 23:50:30
+5 2003/01/22 18:31:46
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -117 +117 @@
-#define AOUT_CHAN_DOLBYSTEREO       0x10000
-#define AOUT_CHAN_DUALMONO          0x20000
+#define AOUT_CHAN_REVERSESTEREO     0x40000
-
-#define AOUT_CHAN_PHYSMASK          0xFFFF

modules/audio_filter/channel_mixer/trivial.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-9 2003/01/14 14:51:02
+10 2003/01/22 18:31:47
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -135 +135 @@
-            }
-        }
+        else if ( p_filter->output.i_original_channels
+                                        & AOUT_CHAN_REVERSESTEREO )
+        {
+            /* Reverse-stereo mode */
+            for ( i = p_in_buf->i_nb_samples; i -= 2; )
+            {
+                *p_dest++ = p_src[1];
+                *p_dest++ = p_src[0];
+                p_src += 2;
+            }
+        }
-        else
-        {

modules/audio_filter/converter/a52tofloat32.c

@@ -5 +5 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-1 2003/01/22 09:54:28
+2 2003/01/22 18:31:47
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -280 +280 @@
-
-/*****************************************************************************
+ * Exchange: helper function to exchange left & right channels
+ *****************************************************************************/
+static void Exchange( float * p_out, const float * p_in )
+{
+    int i;
+    const float * p_first = p_in + 256;
+    const float * p_second = p_in;
+
+    for ( i = 0; i < 256; i++ )
+    {
+        *p_out++ = *p_first++;
+        *p_out++ = *p_second++;
+    }
+}
+
+/*****************************************************************************
- * DoWork: decode an ATSC A/52 frame.
- *****************************************************************************/
@@ -332 +348 @@
-                       p_samples );
-        }
+        else if ( p_filter->output.i_original_channels
+                    & AOUT_CHAN_REVERSESTEREO )
+        {
+            Exchange( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
+                      p_samples );
+        }
-        else
-        {

src/audio_output/common.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-4 2003/01/20 10:59:29
+5 2003/01/22 18:31:47
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -167 +167 @@
-        return "Right";
-    case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT:
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER:
-        return "3F";

src/audio_output/output.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-0 2003/01/22 09:54:29
+1 2003/01/22 18:31:47
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -70 +70 @@
-        var_Get( p_aout, "audio-channels", &val );
-
-
+
+
+
+
+
+
-        {
-            p_aout->output.output.i_original_channels =
@@ -114 +119 @@
-    }
-    else if ( p_aout->output.output.i_physical_channels ==
-
-
-
+
-    {
-        /* Stereo - create the audio-channels variable. */
@@ -132 +135 @@
-        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
-        val.psz_string = N_("Right");
+        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
+        val.psz_string = N_("Reverse stereo");
-        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
-        var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart,