summaryrefslogtreecommitdiff
path: root/ext/faac
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2010-01-16 15:32:47 -0800
committerDavid Schleef <ds@schleef.org>2010-01-16 15:34:33 -0800
commit3c0170aa4b179a386ea65142226ddfb32d3047f5 (patch)
tree251c48a756683cd2aa41777101672f9aa3a54e81 /ext/faac
parent82c07135d4bcbc913f15b766f1b3b89acea678be (diff)
downloadgstreamer-plugins-bad-3c0170aa4b179a386ea65142226ddfb32d3047f5.tar.gz
faac: Fix channel layout
Adjusted the channel mappings to agree with the default channel mappings in the spec, which is presumably what faac is using. Fixes #607105.
Diffstat (limited to 'ext/faac')
-rw-r--r--ext/faac/gstfaac.c24
1 files changed, 15 insertions, 9 deletions
diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c
index 63ed11711..4a1fc8d94 100644
--- a/ext/faac/gstfaac.c
+++ b/ext/faac/gstfaac.c
@@ -356,23 +356,29 @@ static const GstAudioChannelPosition aac_channel_positions[][8] = {
{GST_AUDIO_CHANNEL_POSITION_FRONT_MONO},
{GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT},
- {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
- GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
- GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER},
- {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+ {
+ GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+ },
+ {
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
- GST_AUDIO_CHANNEL_POSITION_REAR_CENTER},
- {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+ GST_AUDIO_CHANNEL_POSITION_REAR_CENTER},
+ {
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT},
- {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+ {
+ GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
- GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, GST_AUDIO_CHANNEL_POSITION_LFE,
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
- GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}
+ GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
+ GST_AUDIO_CHANNEL_POSITION_LFE}
};
static GstCaps *