[vlc-commits] demux: mp4: add missing coreaudio enumerated mappings
Francois Cartegnie
git at videolan.org
Wed Dec 19 15:14:22 CET 2018
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Dec 18 10:17:12 2018 +0100| [ab9477b9cee27af87dc747353992fed9c12f24d3] | committer: Francois Cartegnie
demux: mp4: add missing coreaudio enumerated mappings
but works only with PCM audio...
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ab9477b9cee27af87dc747353992fed9c12f24d3
---
modules/demux/mp4/coreaudio.h | 315 +++++++++++++++++++++++++++++++++++++++++-
modules/demux/mp4/essetup.c | 10 +-
2 files changed, 317 insertions(+), 8 deletions(-)
diff --git a/modules/demux/mp4/coreaudio.h b/modules/demux/mp4/coreaudio.h
index 1922d1e6a8..a27dce67ce 100644
--- a/modules/demux/mp4/coreaudio.h
+++ b/modules/demux/mp4/coreaudio.h
@@ -97,8 +97,149 @@ static const struct
enum CoreAudio_Layout
{
- CoreAudio_Layout_DESC = 0,
- CoreAudio_Layout_BITMAP = (1<<16),
+ CoreAudio_Layout_DESC = 0,
+ CoreAudio_Layout_BITMAP = (1<<16),
+
+ CoreAudio_Layout_Mono = (100<<16) | 1,
+ CoreAudio_Layout_Stereo = (101<<16) | 2,
+ CoreAudio_Layout_StereoHeadphones = (102<<16) | 2,
+ CoreAudio_Layout_MatrixStereo = (103<<16) | 2,
+ CoreAudio_Layout_MidSide = (104<<16) | 2,
+ CoreAudio_Layout_XY = (105<<16) | 2,
+ CoreAudio_Layout_Binaural = (106<<16) | 2,
+ CoreAudio_Layout_Ambisonic_B_Format = (107<<16) | 4,
+
+ CoreAudio_Layout_Quadraphonic = (108<<16) | 4,
+ CoreAudio_Layout_Pentagonal = (109<<16) | 5,
+ CoreAudio_Layout_Hexagonal = (110<<16) | 6,
+ CoreAudio_Layout_Octagonal = (111<<16) | 8,
+ CoreAudio_Layout_Cube = (112<<16) | 8,
+
+ CoreAudio_Layout_MPEG_1_0 = CoreAudio_Layout_Mono,// C
+ CoreAudio_Layout_MPEG_2_0 = CoreAudio_Layout_Stereo, // L R
+ CoreAudio_Layout_MPEG_3_0_A = (113<<16) | 3, // L R C
+ CoreAudio_Layout_MPEG_3_0_B = (114<<16) | 3, // C L R
+ CoreAudio_Layout_MPEG_4_0_A = (115<<16) | 4, // L R C Cs
+ CoreAudio_Layout_MPEG_4_0_B = (116<<16) | 4, // C L R Cs
+ CoreAudio_Layout_MPEG_5_0_A = (117<<16) | 5, // L R C Ls Rs
+ CoreAudio_Layout_MPEG_5_0_B = (118<<16) | 5, // L R Ls Rs C
+ CoreAudio_Layout_MPEG_5_0_C = (119<<16) | 5, // L C R Ls Rs
+ CoreAudio_Layout_MPEG_5_0_D = (120<<16) | 5, // C L R Ls Rs
+ CoreAudio_Layout_MPEG_5_1_A = (121<<16) | 6, // L R C LFE Ls Rs
+ CoreAudio_Layout_MPEG_5_1_B = (122<<16) | 6, // L R Ls Rs C LFE
+ CoreAudio_Layout_MPEG_5_1_C = (123<<16) | 6, // L C R Ls Rs LFE
+ CoreAudio_Layout_MPEG_5_1_D = (124<<16) | 6, // C L R Ls Rs LFE
+ CoreAudio_Layout_MPEG_6_1_A = (125<<16) | 7, // L R C LFE Ls Rs Cs
+ CoreAudio_Layout_MPEG_7_1_A = (126<<16) | 8, // L R C LFE Ls Rs Lc Rc
+ CoreAudio_Layout_MPEG_7_1_B = (127<<16) | 8, // C Lc Rc L R Ls Rs LFE (13818-7 table 42)
+ CoreAudio_Layout_MPEG_7_1_C = (128<<16) | 8, // L R C LFE Ls Rs Rls Rrs
+ CoreAudio_Layout_Emagic_Default_7_1 = (129<<16) | 8, // L R Ls Rs C LFE Lc Rc
+ CoreAudio_Layout_SMPTE_DTV = (130<<16) | 8, // L R C LFE Ls Rs Lt Rt
+
+ CoreAudio_Layout_ITU_1_0 = CoreAudio_Layout_Mono,// C
+ CoreAudio_Layout_ITU_2_0 = CoreAudio_Layout_Stereo, // L R
+
+ CoreAudio_Layout_ITU_2_1 = (131<<16) | 3, // L R Cs
+ CoreAudio_Layout_ITU_2_2 = (132<<16) | 4, // L R Ls Rs
+ CoreAudio_Layout_ITU_3_0 = CoreAudio_Layout_MPEG_3_0_A,// L R C
+ CoreAudio_Layout_ITU_3_1 = CoreAudio_Layout_MPEG_4_0_A,// L R C Cs
+
+ CoreAudio_Layout_ITU_3_2 = CoreAudio_Layout_MPEG_5_0_A,// L R C Ls Rs
+ CoreAudio_Layout_ITU_3_2_1 = CoreAudio_Layout_MPEG_5_1_A,// L R C LFE Ls Rs
+ CoreAudio_Layout_ITU_3_4_1 = CoreAudio_Layout_MPEG_7_1_C,// L R C LFE Ls Rs Rls Rrs
+
+ CoreAudio_Layout_DVD_0 = CoreAudio_Layout_Mono,// C (mono)
+ CoreAudio_Layout_DVD_1 = CoreAudio_Layout_Stereo, // L R
+ CoreAudio_Layout_DVD_2 = CoreAudio_Layout_ITU_2_1,// L R Cs
+ CoreAudio_Layout_DVD_3 = CoreAudio_Layout_ITU_2_2,// L R Ls Rs
+ CoreAudio_Layout_DVD_4 = (133<<16) | 3, // L R LFE
+ CoreAudio_Layout_DVD_5 = (134<<16) | 4, // L R LFE Cs
+ CoreAudio_Layout_DVD_6 = (135<<16) | 5, // L R LFE Ls Rs
+ CoreAudio_Layout_DVD_7 = CoreAudio_Layout_MPEG_3_0_A,// L R C
+ CoreAudio_Layout_DVD_8 = CoreAudio_Layout_MPEG_4_0_A,// L R C Cs
+ CoreAudio_Layout_DVD_9 = CoreAudio_Layout_MPEG_5_0_A,// L R C Ls Rs
+ CoreAudio_Layout_DVD_10 = (136<<16) | 4, // L R C LFE
+ CoreAudio_Layout_DVD_11 = (137<<16) | 5, // L R C LFE Cs
+ CoreAudio_Layout_DVD_12 = CoreAudio_Layout_MPEG_5_1_A,// L R C LFE Ls Rs
+ CoreAudio_Layout_DVD_13 = CoreAudio_Layout_DVD_8, // L R C Cs
+ CoreAudio_Layout_DVD_14 = CoreAudio_Layout_DVD_9, // L R C Ls Rs
+ CoreAudio_Layout_DVD_15 = CoreAudio_Layout_DVD_10, // L R C LFE
+ CoreAudio_Layout_DVD_16 = CoreAudio_Layout_DVD_11, // L R C LFE Cs
+ CoreAudio_Layout_DVD_17 = CoreAudio_Layout_DVD_12, // L R C LFE Ls Rs
+ CoreAudio_Layout_DVD_18 = (138<<16) | 5, // L R Ls Rs LFE
+ CoreAudio_Layout_DVD_19 = CoreAudio_Layout_MPEG_5_0_B,// L R Ls Rs C
+ CoreAudio_Layout_DVD_20 = CoreAudio_Layout_MPEG_5_1_B,// L R Ls Rs C LFE
+
+ CoreAudio_Layout_AudioUnit_4 = CoreAudio_Layout_Quadraphonic,
+ CoreAudio_Layout_AudioUnit_5 = CoreAudio_Layout_Pentagonal,
+ CoreAudio_Layout_AudioUnit_6 = CoreAudio_Layout_Hexagonal,
+ CoreAudio_Layout_AudioUnit_8 = CoreAudio_Layout_Octagonal,
+
+ CoreAudio_Layout_AudioUnit_5_0 = CoreAudio_Layout_MPEG_5_0_B,// L R Ls Rs C
+ CoreAudio_Layout_AudioUnit_6_0 = (139<<16) | 6, // L R Ls Rs C Cs
+ CoreAudio_Layout_AudioUnit_7_0 = (140<<16) | 7, // L R Ls Rs C Rls Rrs
+ CoreAudio_Layout_AudioUnit_7_0_Front= (148<<16) | 7, // L R Ls Rs C Lc Rc
+ CoreAudio_Layout_AudioUnit_5_1 = CoreAudio_Layout_MPEG_5_1_A,// L R C LFE Ls Rs
+ CoreAudio_Layout_AudioUnit_6_1 = CoreAudio_Layout_MPEG_6_1_A,// L R C LFE Ls Rs Cs
+ CoreAudio_Layout_AudioUnit_7_1 = CoreAudio_Layout_MPEG_7_1_C,// L R C LFE Ls Rs Rls Rrs
+ CoreAudio_Layout_AudioUnit_7_1_Front= CoreAudio_Layout_MPEG_7_1_A,// L R C LFE Ls Rs Lc Rc
+
+ CoreAudio_Layout_AAC_3_0 = CoreAudio_Layout_MPEG_3_0_B,// C L R
+ CoreAudio_Layout_AAC_Quadraphonic = CoreAudio_Layout_Quadraphonic, // L R Ls Rs
+ CoreAudio_Layout_AAC_4_0 = CoreAudio_Layout_MPEG_4_0_B,// C L R Cs
+ CoreAudio_Layout_AAC_5_0 = CoreAudio_Layout_MPEG_5_0_D,// C L R Ls Rs
+ CoreAudio_Layout_AAC_5_1 = CoreAudio_Layout_MPEG_5_1_D,// C L R Ls Rs Lfe
+ CoreAudio_Layout_AAC_6_0 = (141<<16) | 6, // C L R Ls Rs Cs
+ CoreAudio_Layout_AAC_6_1 = (142<<16) | 7, // C L R Ls Rs Cs Lfe
+ CoreAudio_Layout_AAC_7_0 = (143<<16) | 7, // C L R Ls Rs Rls Rrs
+ CoreAudio_Layout_AAC_7_1 = CoreAudio_Layout_MPEG_7_1_B,// C Lc Rc L R Ls Rs Lfe
+ CoreAudio_Layout_AAC_7_1_B = (183<<16) | 8, // C L R Ls Rs Rls Rrs LFE
+ CoreAudio_Layout_AAC_Octagonal = (144<<16) | 8, // C L R Ls Rs Rls Rrs Cs
+
+ CoreAudio_Layout_TMH_10_2_std = (145<<16) | 16, // L R C Vhc Lsd Rsd Ls Rs Vhl Vhr Lw Rw Csd Cs LFE1 LFE2
+ CoreAudio_Layout_TMH_10_2_full = (146<<16) | 21, // TMH_10_2_std plus: Lc Rc HI VI Haptic
+
+ CoreAudio_Layout_AC3_1_0_1 = (149<<16) | 2, // C LFE
+ CoreAudio_Layout_AC3_3_0 = (150<<16) | 3, // L C R
+ CoreAudio_Layout_AC3_3_1 = (151<<16) | 4, // L C R Cs
+ CoreAudio_Layout_AC3_3_0_1 = (152<<16) | 4, // L C R LFE
+ CoreAudio_Layout_AC3_2_1_1 = (153<<16) | 4, // L R Cs LFE
+ CoreAudio_Layout_AC3_3_1_1 = (154<<16) | 5, // L C R Cs LFE
+
+ CoreAudio_Layout_EAC_6_0_A = (155<<16) | 6, // L C R Ls Rs Cs
+ CoreAudio_Layout_EAC_7_0_A = (156<<16) | 7, // L C R Ls Rs Rls Rrs
+
+ CoreAudio_Layout_EAC3_6_1_A = (157<<16) | 7, // L C R Ls Rs LFE Cs
+ CoreAudio_Layout_EAC3_6_1_B = (158<<16) | 7, // L C R Ls Rs LFE Ts
+ CoreAudio_Layout_EAC3_6_1_C = (159<<16) | 7, // L C R Ls Rs LFE Vhc
+ CoreAudio_Layout_EAC3_7_1_A = (160<<16) | 8, // L C R Ls Rs LFE Rls Rrs
+ CoreAudio_Layout_EAC3_7_1_B = (161<<16) | 8, // L C R Ls Rs LFE Lc Rc
+ CoreAudio_Layout_EAC3_7_1_C = (162<<16) | 8, // L C R Ls Rs LFE Lsd Rsd
+ CoreAudio_Layout_EAC3_7_1_D = (163<<16) | 8, // L C R Ls Rs LFE Lw Rw
+ CoreAudio_Layout_EAC3_7_1_E = (164<<16) | 8, // L C R Ls Rs LFE Vhl Vhr
+
+ CoreAudio_Layout_EAC3_7_1_F = (165<<16) | 8,// L C R Ls Rs LFE Cs Ts
+ CoreAudio_Layout_EAC3_7_1_G = (166<<16) | 8,// L C R Ls Rs LFE Cs Vhc
+ CoreAudio_Layout_EAC3_7_1_H = (167<<16) | 8,// L C R Ls Rs LFE Ts Vhc
+
+ CoreAudio_Layout_DTS_3_1 = (168<<16) | 4,// C L R LFE
+ CoreAudio_Layout_DTS_4_1 = (169<<16) | 5,// C L R Cs LFE
+ CoreAudio_Layout_DTS_6_0_A = (170<<16) | 6,// Lc Rc L R Ls Rs
+ CoreAudio_Layout_DTS_6_0_B = (171<<16) | 6,// C L R Rls Rrs Ts
+ CoreAudio_Layout_DTS_6_0_C = (172<<16) | 6,// C Cs L R Rls Rrs
+ CoreAudio_Layout_DTS_6_1_A = (173<<16) | 7,// Lc Rc L R Ls Rs LFE
+ CoreAudio_Layout_DTS_6_1_B = (174<<16) | 7,// C L R Rls Rrs Ts LFE
+ CoreAudio_Layout_DTS_6_1_C = (175<<16) | 7,// C Cs L R Rls Rrs LFE
+ CoreAudio_Layout_DTS_7_0 = (176<<16) | 7,// Lc C Rc L R Ls Rs
+ CoreAudio_Layout_DTS_7_1 = (177<<16) | 8,// Lc C Rc L R Ls Rs LFE
+ CoreAudio_Layout_DTS_8_0_A = (178<<16) | 8,// Lc Rc L R Ls Rs Rls Rrs
+ CoreAudio_Layout_DTS_8_0_B = (179<<16) | 8,// Lc C Rc L R Ls Cs Rs
+ CoreAudio_Layout_DTS_8_1_A = (180<<16) | 9,// Lc Rc L R Ls Rs Rls Rrs LFE
+ CoreAudio_Layout_DTS_8_1_B = (181<<16) | 9,// Lc C Rc L R Ls Cs Rs LFE
+ CoreAudio_Layout_DTS_6_1_D = (182<<16) | 7,// C L R Ls Rs LFE Cs
+
+ CoreAudio_Layout_DiscreteInOrder = (147<<16) | 0,
+ CoreAudio_Layout_Unknown = 0xFFFF0000
};
static inline int CoreAudio_Bitmap_to_vlc_bitmap( const struct CoreAudio_layout_s *c,
@@ -126,3 +267,173 @@ static inline int CoreAudio_Bitmap_to_vlc_bitmap( const struct CoreAudio_layout_
}
return VLC_SUCCESS;
}
+
+static const uint32_t pi_vlc_chan_order_C[] = {
+ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT,
+ AOUT_CHAN_REARLEFT, AOUT_CHAN_REARCENTER, AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_LFE,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
+ 0
+};
+
+static const uint32_t pi_vlc_chan_order_B[] = {
+ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
+ AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_CENTER,
+ AOUT_CHAN_LFE,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
+ AOUT_CHAN_REARCENTER,
+ 0
+};
+
+static const uint32_t pi_vlc_chan_order_AAC[] = {
+ AOUT_CHAN_CENTER, AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
+ AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_REARCENTER,
+ AOUT_CHAN_LFE, 0
+};
+
+static const uint32_t pi_vlc_chan_order_EAC[] = {
+ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
+ AOUT_CHAN_LFE,
+ AOUT_CHAN_REARLEFT, AOUT_CHAN_REARCENTER, AOUT_CHAN_REARRIGHT,
+ 0
+};
+
+static const uint32_t pi_vlc_chan_order_DTS[] = {
+ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
+ AOUT_CHAN_REARLEFT, AOUT_CHAN_REARCENTER, AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_LFE,
+ 0
+};
+
+static const uint32_t pi_vlc_chan_order_DTS_C[] = {
+ AOUT_CHAN_CENTER, AOUT_CHAN_REARCENTER,
+ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
+ AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_LFE,
+ 0
+};
+
+static const struct
+{
+ enum CoreAudio_Layout layout;
+ const uint32_t *p_chans_order;
+ uint16_t i_vlc_bitmap;
+} CoreAudio_Layout_mapping[] = {
+ { CoreAudio_Layout_Mono, NULL, AOUT_CHAN_CENTER },
+ { CoreAudio_Layout_Stereo, NULL, AOUT_CHANS_STEREO },
+ { CoreAudio_Layout_StereoHeadphones, NULL, AOUT_CHANS_STEREO },
+ { CoreAudio_Layout_Binaural, NULL, AOUT_CHANS_STEREO },
+// CoreAudio_Layout_Ambisonic_B_Format
+
+ { CoreAudio_Layout_Quadraphonic, NULL, AOUT_CHANS_4_0_MIDDLE },
+ { CoreAudio_Layout_Pentagonal, pi_vlc_chan_order_B, AOUT_CHANS_4_0 | AOUT_CHAN_CENTER },
+// { CoreAudio_Layout_Hexagonal
+// { CoreAudio_Layout_Octagonal
+// { CoreAudio_Layout_Cube
+
+ { CoreAudio_Layout_MPEG_3_0_A, pi_vlc_chan_order_CoreAudio, AOUT_CHANS_3_0 },
+ { CoreAudio_Layout_MPEG_3_0_B, NULL, AOUT_CHANS_3_0 },
+ { CoreAudio_Layout_MPEG_4_0_A, pi_vlc_chan_order_CoreAudio, AOUT_CHANS_3_0 | AOUT_CHAN_REARCENTER },
+ { CoreAudio_Layout_MPEG_4_0_B, NULL, AOUT_CHANS_3_0 | AOUT_CHAN_REARCENTER },
+ { CoreAudio_Layout_MPEG_5_0_A, pi_vlc_chan_order_CoreAudio, AOUT_CHANS_5_0 },
+ { CoreAudio_Layout_MPEG_5_0_B, pi_vlc_chan_order_B, AOUT_CHANS_5_0 },
+ { CoreAudio_Layout_MPEG_5_0_C, pi_vlc_chan_order_C, AOUT_CHANS_5_0 },
+ { CoreAudio_Layout_MPEG_5_0_D, NULL, AOUT_CHANS_5_0 },
+ { CoreAudio_Layout_MPEG_5_1_A, pi_vlc_chan_order_CoreAudio, AOUT_CHANS_5_1 },
+ { CoreAudio_Layout_MPEG_5_1_B, pi_vlc_chan_order_B, AOUT_CHANS_5_1 },
+ { CoreAudio_Layout_MPEG_5_1_C, pi_vlc_chan_order_C, AOUT_CHANS_5_1 },
+ { CoreAudio_Layout_MPEG_5_1_D, NULL, AOUT_CHANS_5_1 },
+ { CoreAudio_Layout_MPEG_6_1_A, pi_vlc_chan_order_CoreAudio, AOUT_CHANS_5_1 | AOUT_CHAN_REARCENTER },
+ { CoreAudio_Layout_MPEG_7_1_A, pi_vlc_chan_order_CoreAudio, AOUT_CHANS_7_1 },
+ { CoreAudio_Layout_MPEG_7_1_B, pi_vlc_chan_order_AAC, AOUT_CHANS_7_1 },
+ { CoreAudio_Layout_MPEG_7_1_C, pi_vlc_chan_order_CoreAudio, AOUT_CHANS_7_1 },
+ { CoreAudio_Layout_Emagic_Default_7_1, pi_vlc_chan_order_B, AOUT_CHANS_7_1 },
+
+ { CoreAudio_Layout_ITU_2_1, pi_vlc_chan_order_CoreAudio, AOUT_CHANS_3_0 },
+ { CoreAudio_Layout_ITU_2_2, pi_vlc_chan_order_CoreAudio, AOUT_CHANS_4_0 },
+
+ { CoreAudio_Layout_DVD_4, pi_vlc_chan_order_CoreAudio, AOUT_CHANS_2_1 },
+ { CoreAudio_Layout_DVD_5, pi_vlc_chan_order_CoreAudio, AOUT_CHANS_2_1 | AOUT_CHAN_REARCENTER },
+ { CoreAudio_Layout_DVD_6, pi_vlc_chan_order_CoreAudio, AOUT_CHANS_2_1 | AOUT_CHANS_REAR },
+ { CoreAudio_Layout_DVD_10, pi_vlc_chan_order_CoreAudio, AOUT_CHANS_3_1 },
+ { CoreAudio_Layout_DVD_11, pi_vlc_chan_order_CoreAudio, AOUT_CHANS_3_1 | AOUT_CHAN_REARCENTER },
+ { CoreAudio_Layout_DVD_18, pi_vlc_chan_order_B, AOUT_CHANS_5_1 },
+
+ { CoreAudio_Layout_AudioUnit_6_0, pi_vlc_chan_order_B, AOUT_CHANS_5_0 | AOUT_CHAN_REARCENTER },
+ //CoreAudio_Layout_AudioUnit_7_0
+ { CoreAudio_Layout_AudioUnit_7_0_Front, pi_vlc_chan_order_B, AOUT_CHANS_5_0 | AOUT_CHANS_MIDDLE },
+
+ { CoreAudio_Layout_AAC_6_0, pi_vlc_chan_order_AAC, AOUT_CHANS_5_0 | AOUT_CHAN_REARCENTER },
+ { CoreAudio_Layout_AAC_6_1, pi_vlc_chan_order_AAC, AOUT_CHANS_5_0 | AOUT_CHAN_REARCENTER | AOUT_CHAN_LFE },
+ { CoreAudio_Layout_AAC_7_0, pi_vlc_chan_order_AAC, AOUT_CHANS_5_0 | AOUT_CHANS_MIDDLE },
+ { CoreAudio_Layout_AAC_7_1_B, pi_vlc_chan_order_AAC, AOUT_CHANS_7_1 },
+ { CoreAudio_Layout_AAC_Octagonal, pi_vlc_chan_order_AAC, AOUT_CHANS_7_0 | AOUT_CHAN_REARCENTER },
+
+ // CoreAudio_Layout_TMH_10_2_std
+ // CoreAudio_Layout_TMH_10_2_full
+
+ { CoreAudio_Layout_AC3_1_0_1, pi_vlc_chan_order_C, AOUT_CHAN_CENTER | AOUT_CHAN_LFE },
+ { CoreAudio_Layout_AC3_3_0, pi_vlc_chan_order_C, AOUT_CHANS_3_0 },
+ { CoreAudio_Layout_AC3_3_1, pi_vlc_chan_order_C, AOUT_CHANS_3_0 | AOUT_CHAN_REARCENTER },
+ { CoreAudio_Layout_AC3_3_0_1, pi_vlc_chan_order_C, AOUT_CHANS_3_0 | AOUT_CHAN_LFE },
+ { CoreAudio_Layout_AC3_2_1_1, pi_vlc_chan_order_C, AOUT_CHANS_2_1 | AOUT_CHAN_REARCENTER },
+ { CoreAudio_Layout_AC3_3_1_1, pi_vlc_chan_order_C, AOUT_CHANS_3_1 | AOUT_CHAN_REARCENTER },
+
+ { CoreAudio_Layout_EAC_6_0_A, pi_vlc_chan_order_C, AOUT_CHANS_4_0 | AOUT_CHAN_CENTER | AOUT_CHAN_REARCENTER },
+ { CoreAudio_Layout_EAC_7_0_A, pi_vlc_chan_order_C, AOUT_CHANS_6_0 | AOUT_CHAN_CENTER },
+
+ { CoreAudio_Layout_EAC3_6_1_A, pi_vlc_chan_order_EAC, AOUT_CHANS_4_0 | AOUT_CHAN_CENTER | AOUT_CHAN_REARCENTER | AOUT_CHAN_LFE },
+ // { CoreAudio_Layout_EAC3_6_1_B, pi_vlc_chan_order_EAC, },
+ // { CoreAudio_Layout_EAC3_6_1_C, pi_vlc_chan_order_EAC, },
+ // { CoreAudio_Layout_EAC3_7_1_A, pi_vlc_chan_order_EAC, },
+ { CoreAudio_Layout_EAC3_7_1_B, pi_vlc_chan_order_EAC, AOUT_CHANS_7_1 },
+ // { CoreAudio_Layout_EAC3_7_1_C, pi_vlc_chan_order_EAC, },
+ // { CoreAudio_Layout_EAC3_7_1_D, pi_vlc_chan_order_EAC, },
+ // { CoreAudio_Layout_EAC3_7_1_E, pi_vlc_chan_order_EAC, },
+
+ // { CoreAudio_Layout_EAC3_7_1_F, pi_vlc_chan_order_EAC, },
+ // { CoreAudio_Layout_EAC3_7_1_G, pi_vlc_chan_order_EAC, },
+ // { CoreAudio_Layout_EAC3_7_1_H, pi_vlc_chan_order_EAC, },
+
+ { CoreAudio_Layout_DTS_3_1, NULL, AOUT_CHANS_3_1 },
+ { CoreAudio_Layout_DTS_4_1, NULL, AOUT_CHANS_3_1 | AOUT_CHAN_REARCENTER },
+ { CoreAudio_Layout_DTS_6_0_A, NULL, AOUT_CHANS_6_0 },
+ // { CoreAudio_Layout_DTS_6_0_B, NULL, },
+ { CoreAudio_Layout_DTS_6_0_C, pi_vlc_chan_order_DTS_C, AOUT_CHANS_6_0 },
+ { CoreAudio_Layout_DTS_6_1_A, NULL, AOUT_CHANS_6_1_MIDDLE },
+ //{ CoreAudio_Layout_DTS_6_1_B, NULL, },
+ { CoreAudio_Layout_DTS_6_1_C, pi_vlc_chan_order_DTS_C, AOUT_CHANS_6_1_MIDDLE },
+ { CoreAudio_Layout_DTS_7_0, pi_vlc_chan_order_DTS, AOUT_CHANS_6_0 | AOUT_CHAN_CENTER },
+ { CoreAudio_Layout_DTS_7_1, pi_vlc_chan_order_DTS, AOUT_CHANS_7_1 },
+ // { CoreAudio_Layout_DTS_8_0_A
+ { CoreAudio_Layout_DTS_8_0_B, pi_vlc_chan_order_DTS, AOUT_CHANS_5_0 | AOUT_CHANS_MIDDLE | AOUT_CHAN_REARCENTER },
+ //{ CoreAudio_Layout_DTS_8_1_A
+ //{ CoreAudio_Layout_DTS_8_1_B = (181<<16) | 9,// Lc C Rc L R Ls Cs Rs LFE
+ //{ CoreAudio_Layout_DTS_6_1_D = (182<<16) | 7,// C L R Ls Rs LFE Cs
+};
+
+static inline int CoreAudio_Layout_to_vlc( const struct CoreAudio_layout_s *c,
+ uint16_t *pi_bitmap,
+ uint8_t *pi_channels,
+ const uint32_t **pp_chans_order )
+{
+ if( c->i_channels_layout_tag == CoreAudio_Layout_BITMAP )
+ return CoreAudio_Bitmap_to_vlc_bitmap( c, pi_bitmap, pi_channels, pp_chans_order );
+
+ for (size_t i=0;i<ARRAY_SIZE(CoreAudio_Layout_mapping);i++)
+ {
+ if(CoreAudio_Layout_mapping[i].layout == c->i_channels_layout_tag )
+ {
+ *pi_bitmap = CoreAudio_Layout_mapping[i].i_vlc_bitmap;
+ *pp_chans_order = CoreAudio_Layout_mapping[i].p_chans_order;
+ *pi_channels = c->i_channels_layout_tag & 0xFF;
+ break;
+ }
+ }
+ return VLC_SUCCESS;
+}
diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c
index 637d2d670c..b633d87b64 100644
--- a/modules/demux/mp4/essetup.c
+++ b/modules/demux/mp4/essetup.c
@@ -1187,15 +1187,13 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
uint8_t i_channels = 0;
const uint32_t *p_rg_chans_order = NULL;
- if ( BOXDATA(p_chan)->layout.i_channels_layout_tag == CoreAudio_Layout_BITMAP &&
- CoreAudio_Bitmap_to_vlc_bitmap( &BOXDATA(p_chan)->layout,
- &i_vlc_mapping, &i_channels,
- &p_rg_chans_order ) != VLC_SUCCESS )
+ if ( CoreAudio_Layout_to_vlc( &BOXDATA(p_chan)->layout,
+ &i_vlc_mapping, &i_channels,
+ &p_rg_chans_order ) != VLC_SUCCESS )
{
msg_Warn( p_demux, "discarding chan mapping" );
}
-
- if( i_vlc_mapping )
+ else if( i_vlc_mapping )
{
const unsigned i_bps = aout_BitsPerSample( p_track->fmt.i_codec );
/* Uncompressed audio */
More information about the vlc-commits
mailing list