Module: libav
Branch: master
Commit: af2f655c02c69aa615eb2a06000a1aa35916967a
Author: Carl Eugen Hoyos <ceho...@ag.or.at>
Committer: Alex Converse <alex.conve...@gmail.com>
Date: Wed Jan 25 02:51:49 2012 +0100
faac: Fix multi-channel ordering
Signed-off-by: Alex Converse <alex.conve...@gmail.com>
---
libavcodec/libfaac.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c
index 6627794..e18e133 100644
--- a/libavcodec/libfaac.c
+++ b/libavcodec/libfaac.c
@@ -57,6 +57,13 @@ static av_cold int Faac_encode_close(AVCodecContext *avctx)
return 0;
}
+static const int channel_maps[][6] = {
+ { 2, 0, 1 }, //< C L R
+ { 2, 0, 1, 3 }, //< C L R Cs
+ { 2, 0, 1, 3, 4 }, //< C L R Ls Rs
+ { 2, 0, 1, 4, 5, 3 }, //< C L R Ls Rs LFE
+};
+
static av_cold int Faac_encode_init(AVCodecContext *avctx)
{
FaacAudioContext *s = avctx->priv_data;
@@ -119,6 +126,9 @@ static av_cold int Faac_encode_init(AVCodecContext *avctx)
}
faac_cfg->outputFormat = 1;
faac_cfg->inputFormat = FAAC_INPUT_16BIT;
+ if (avctx->channels > 2)
+ memcpy(faac_cfg->channel_map, channel_maps[avctx->channels-3],
+ avctx->channels * sizeof(int));
avctx->frame_size = samples_input / avctx->channels;
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
