diff options
| author | James Almer <jamrial@gmail.com> | 2022-11-27 19:16:03 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-11-29 09:06:21 -0300 |
| commit | 3d96775f9e56a9de6f5dd728a3297036a721ce0e (patch) | |
| tree | f04b26bef7cac6e83fd741f0b57573bf55e930b3 | |
| parent | bb45f41a6b8acdf3fd6d0dba29330b965b229a44 (diff) | |
| download | ffmpeg-3d96775f9e56a9de6f5dd728a3297036a721ce0e.tar.gz | |
avcodec/libfdk-aacenc: add support for 6.1(back) channel layout
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/libfdk-aacenc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index dc2ac377d0..4aaeb1aeaa 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -190,6 +190,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) /* The version macro is introduced the same time as the 7.1 support, so this should suffice. */ #if FDKENC_VER_AT_LEAST(3, 4) // 3.4.12 + case 7: mode = MODE_6_1; sce = 3; cpe = 2; break; case 8: sce = 2; cpe = 3; @@ -451,6 +452,7 @@ static const uint64_t aac_channel_layout[] = { AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_5POINT1_BACK, #if FDKENC_VER_AT_LEAST(3, 4) // 3.4.12 + AV_CH_LAYOUT_6POINT1_BACK, AV_CH_LAYOUT_7POINT1_WIDE_BACK, AV_CH_LAYOUT_7POINT1, AV_CH_LAYOUT_7POINT1_TOP_BACK, @@ -467,6 +469,7 @@ static const AVChannelLayout aac_ch_layouts[16] = { AV_CHANNEL_LAYOUT_5POINT0_BACK, AV_CHANNEL_LAYOUT_5POINT1_BACK, #ifdef AACENCODER_LIB_VL0 + AV_CHANNEL_LAYOUT_6POINT1_BACK, AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK, AV_CHANNEL_LAYOUT_7POINT1, AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK, |