Commit a99a0610 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Mono: fix channel order

(cherry picked from commit 303de67a0d1eb0d98145d8b0d3ff55a7f44aef59)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent fa199b4c
...@@ -89,15 +89,21 @@ struct filter_sys_t ...@@ -89,15 +89,21 @@ struct filter_sys_t
#define MONO_CHANNEL_LONGTEXT N_("This option silences all other channels " \ #define MONO_CHANNEL_LONGTEXT N_("This option silences all other channels " \
"except the selected channel.") "except the selected channel.")
static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5 }; static const int pi_pos_values[] = { 0, 1, 4, 5, 7, 8, 2, 3, 6 };
static const char *const ppsz_pos_descriptions[] = static const char *const ppsz_pos_descriptions[] =
{ N_("Left"), N_("Right"), N_("Left rear"), N_("Right rear"), N_("Center"), { N_("Left"), N_("Right"),
N_("Left front") }; N_("Rear left"), N_("Rear right"),
N_("Center"), N_("Low-frequency effects"),
N_("Side left"), N_("Side right"), N_("Rear center") };
/* our internal channel order (WG-4 order) */ /* our internal channel order (WG-4 order)
static const uint32_t pi_channels_out[] = static const uint32_t pi_vlc_chan_order_wg4[] =
{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, {
AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 }; AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_REARCENTER,
AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0
}; */
#define MONO_CFG "sout-mono-" #define MONO_CFG "sout-mono-"
/***************************************************************************** /*****************************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment