diff mbox series

[FFmpeg-devel,4/4] avformat/mov_chan: add missing AAC 7.1 mappings

Message ID 20221028122140.1885-4-jamrial@gmail.com
State New
Headers show
Series [FFmpeg-devel,1/4,v2] avcodec/aacdec: fix parsing streams with channel configuration 11 | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

James Almer Oct. 28, 2022, 12:21 p.m. UTC 
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/mov_chan.c | 5 +++++
 libavformat/mov_chan.h | 2 ++
 2 files changed, 7 insertions(+)
diff mbox series

Patch

diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c
index 5b757c6a8a..19da01996c 100644
--- a/libavformat/mov_chan.c
+++ b/libavformat/mov_chan.c
@@ -186,6 +186,9 @@  static const struct MovChannelLayoutMap mov_ch_layout_map_8ch[] = {
 
     { MOV_CH_LAYOUT_MPEG_7_1_C,          AV_CH_LAYOUT_7POINT1 },        // L, R, C, LFE, Ls, Rs,  Rls, Rrs
     { MOV_CH_LAYOUT_EAC3_7_1_A,          AV_CH_LAYOUT_7POINT1 },        // L, C, R, Ls,  Rs, LFE, Rls, Rrs
+    { MOV_CH_LAYOUT_AAC_7_1_B,           AV_CH_LAYOUT_7POINT1 },        // C, L, R, Ls,  Rs, Rls, Rrs, LFE
+
+    { MOV_CH_LAYOUT_AAC_7_1_C,           AV_CH_LAYOUT_7POINT1_TOP },    // C, L, R, Ls, Rs, LFE, Vhl, Vhr
 
     { MOV_CH_LAYOUT_SMPTE_DTV,           AV_CH_LAYOUT_5POINT1 |         // L, R, C, LFE, Ls, Rs, Lt, Rt
                                          AV_CH_LAYOUT_STEREO_DOWNMIX },
@@ -276,6 +279,8 @@  static const enum MovChannelLayoutTag mov_ch_layouts_aac[] = {
     MOV_CH_LAYOUT_DTS_6_1_A,
     MOV_CH_LAYOUT_AAC_OCTAGONAL,
     MOV_CH_LAYOUT_MPEG_7_1_B,
+    MOV_CH_LAYOUT_AAC_7_1_B,
+    MOV_CH_LAYOUT_AAC_7_1_C,
     MOV_CH_LAYOUT_DTS_8_0_A,
     0,
 };
diff --git a/libavformat/mov_chan.h b/libavformat/mov_chan.h
index 93d9878798..322fdecff8 100644
--- a/libavformat/mov_chan.h
+++ b/libavformat/mov_chan.h
@@ -135,6 +135,8 @@  enum MovChannelLayoutTag {
     MOV_CH_LAYOUT_DTS_8_0_B             = (179 << 16) | 8,
     MOV_CH_LAYOUT_DTS_8_1_A             = (180 << 16) | 9,
     MOV_CH_LAYOUT_DTS_8_1_B             = (181 << 16) | 9,
+    MOV_CH_LAYOUT_AAC_7_1_B             = (183 << 16) | 8,
+    MOV_CH_LAYOUT_AAC_7_1_C             = (184 << 16) | 8,
 };
 
 /**