From ca332b1d8c9d869c4dd98a6eae5e464d702948cc Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Mon, 16 Apr 2012 10:35:11 -0700 Subject: faac: Add .channel_layouts --- libavcodec/libfaac.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'libavcodec/libfaac.c') diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c index bb19083142..66277949b0 100644 --- a/libavcodec/libfaac.c +++ b/libavcodec/libfaac.c @@ -29,6 +29,7 @@ #include "avcodec.h" #include "audio_frame_queue.h" #include "internal.h" +#include "libavutil/audioconvert.h" /* libfaac has an encoder delay of 1024 samples */ @@ -214,6 +215,16 @@ static const AVProfile profiles[] = { { FF_PROFILE_UNKNOWN }, }; +static const uint64_t faac_channel_layouts[] = { + AV_CH_LAYOUT_MONO, + AV_CH_LAYOUT_STEREO, + AV_CH_LAYOUT_SURROUND, + AV_CH_LAYOUT_4POINT0, + AV_CH_LAYOUT_5POINT0_BACK, + AV_CH_LAYOUT_5POINT1_BACK, + 0 +}; + AVCodec ff_libfaac_encoder = { .name = "libfaac", .type = AVMEDIA_TYPE_AUDIO, @@ -227,4 +238,5 @@ AVCodec ff_libfaac_encoder = { AV_SAMPLE_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("libfaac AAC (Advanced Audio Codec)"), .profiles = NULL_IF_CONFIG_SMALL(profiles), + .channel_layouts = faac_channel_layouts, }; -- cgit v1.2.3 From af2f655c02c69aa615eb2a06000a1aa35916967a Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 25 Jan 2012 02:51:49 +0100 Subject: faac: Fix multi-channel ordering Signed-off-by: Alex Converse --- libavcodec/libfaac.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'libavcodec/libfaac.c') diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c index 66277949b0..e18e133bc7 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; -- cgit v1.2.3