Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/mov_chan: move the definition of MovChannelLayoutTag to the header

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
release/5.1
James Almer 3 years ago
parent c2c5f34843
commit feb3b44c1c
2 changed files with 104 additions and 104 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 104
      libavformat/mov_chan.c
  2. 104
      libavformat/mov_chan.h

104
libavformat/mov_chan.c
Unescape View File

@ -29,110 +29,6 @@
#include "libavcodec/codec_id.h" #include "libavcodec/codec_id.h"
#include "mov_chan.h" #include "mov_chan.h"
/**
* Channel Layout Tag
* This tells which channels are present in the audio stream and the order in
* which they appear.
*
* @note We're using the channel layout tag to indicate channel order
* when the value is greater than 0x10000. The Apple documentation has
* some contradictions as to how this is actually supposed to be handled.
*
* Core Audio File Format Spec:
* "The high 16 bits indicates a specific ordering of the channels."
* Core Audio Data Types Reference:
* "These identifiers specify the channels included in a layout but
* do not specify a particular ordering of those channels."
*/
enum MovChannelLayoutTag {
#define MOV_CH_LAYOUT_UNKNOWN 0xFFFF0000
MOV_CH_LAYOUT_USE_DESCRIPTIONS = ( 0 << 16) | 0,
MOV_CH_LAYOUT_USE_BITMAP = ( 1 << 16) | 0,
MOV_CH_LAYOUT_DISCRETEINORDER = (147 << 16) | 0,
MOV_CH_LAYOUT_MONO = (100 << 16) | 1,
MOV_CH_LAYOUT_STEREO = (101 << 16) | 2,
MOV_CH_LAYOUT_STEREOHEADPHONES = (102 << 16) | 2,
MOV_CH_LAYOUT_MATRIXSTEREO = (103 << 16) | 2,
MOV_CH_LAYOUT_MIDSIDE = (104 << 16) | 2,
MOV_CH_LAYOUT_XY = (105 << 16) | 2,
MOV_CH_LAYOUT_BINAURAL = (106 << 16) | 2,
MOV_CH_LAYOUT_AMBISONIC_B_FORMAT = (107 << 16) | 4,
MOV_CH_LAYOUT_QUADRAPHONIC = (108 << 16) | 4,
MOV_CH_LAYOUT_PENTAGONAL = (109 << 16) | 5,
MOV_CH_LAYOUT_HEXAGONAL = (110 << 16) | 6,
MOV_CH_LAYOUT_OCTAGONAL = (111 << 16) | 8,
MOV_CH_LAYOUT_CUBE = (112 << 16) | 8,
MOV_CH_LAYOUT_MPEG_3_0_A = (113 << 16) | 3,
MOV_CH_LAYOUT_MPEG_3_0_B = (114 << 16) | 3,
MOV_CH_LAYOUT_MPEG_4_0_A = (115 << 16) | 4,
MOV_CH_LAYOUT_MPEG_4_0_B = (116 << 16) | 4,
MOV_CH_LAYOUT_MPEG_5_0_A = (117 << 16) | 5,
MOV_CH_LAYOUT_MPEG_5_0_B = (118 << 16) | 5,
MOV_CH_LAYOUT_MPEG_5_0_C = (119 << 16) | 5,
MOV_CH_LAYOUT_MPEG_5_0_D = (120 << 16) | 5,
MOV_CH_LAYOUT_MPEG_5_1_A = (121 << 16) | 6,
MOV_CH_LAYOUT_MPEG_5_1_B = (122 << 16) | 6,
MOV_CH_LAYOUT_MPEG_5_1_C = (123 << 16) | 6,
MOV_CH_LAYOUT_MPEG_5_1_D = (124 << 16) | 6,
MOV_CH_LAYOUT_MPEG_6_1_A = (125 << 16) | 7,
MOV_CH_LAYOUT_MPEG_7_1_A = (126 << 16) | 8,
MOV_CH_LAYOUT_MPEG_7_1_B = (127 << 16) | 8,
MOV_CH_LAYOUT_MPEG_7_1_C = (128 << 16) | 8,
MOV_CH_LAYOUT_EMAGIC_DEFAULT_7_1 = (129 << 16) | 8,
MOV_CH_LAYOUT_SMPTE_DTV = (130 << 16) | 8,
MOV_CH_LAYOUT_ITU_2_1 = (131 << 16) | 3,
MOV_CH_LAYOUT_ITU_2_2 = (132 << 16) | 4,
MOV_CH_LAYOUT_DVD_4 = (133 << 16) | 3,
MOV_CH_LAYOUT_DVD_5 = (134 << 16) | 4,
MOV_CH_LAYOUT_DVD_6 = (135 << 16) | 5,
MOV_CH_LAYOUT_DVD_10 = (136 << 16) | 4,
MOV_CH_LAYOUT_DVD_11 = (137 << 16) | 5,
MOV_CH_LAYOUT_DVD_18 = (138 << 16) | 5,
MOV_CH_LAYOUT_AUDIOUNIT_6_0 = (139 << 16) | 6,
MOV_CH_LAYOUT_AUDIOUNIT_7_0 = (140 << 16) | 7,
MOV_CH_LAYOUT_AUDIOUNIT_7_0_FRONT = (148 << 16) | 7,
MOV_CH_LAYOUT_AAC_6_0 = (141 << 16) | 6,
MOV_CH_LAYOUT_AAC_6_1 = (142 << 16) | 7,
MOV_CH_LAYOUT_AAC_7_0 = (143 << 16) | 7,
MOV_CH_LAYOUT_AAC_OCTAGONAL = (144 << 16) | 8,
MOV_CH_LAYOUT_TMH_10_2_STD = (145 << 16) | 16,
MOV_CH_LAYOUT_TMH_10_2_FULL = (146 << 16) | 21,
MOV_CH_LAYOUT_AC3_1_0_1 = (149 << 16) | 2,
MOV_CH_LAYOUT_AC3_3_0 = (150 << 16) | 3,
MOV_CH_LAYOUT_AC3_3_1 = (151 << 16) | 4,
MOV_CH_LAYOUT_AC3_3_0_1 = (152 << 16) | 4,
MOV_CH_LAYOUT_AC3_2_1_1 = (153 << 16) | 4,
MOV_CH_LAYOUT_AC3_3_1_1 = (154 << 16) | 5,
MOV_CH_LAYOUT_EAC3_6_0_A = (155 << 16) | 6,
MOV_CH_LAYOUT_EAC3_7_0_A = (156 << 16) | 7,
MOV_CH_LAYOUT_EAC3_6_1_A = (157 << 16) | 7,
MOV_CH_LAYOUT_EAC3_6_1_B = (158 << 16) | 7,
MOV_CH_LAYOUT_EAC3_6_1_C = (159 << 16) | 7,
MOV_CH_LAYOUT_EAC3_7_1_A = (160 << 16) | 8,
MOV_CH_LAYOUT_EAC3_7_1_B = (161 << 16) | 8,
MOV_CH_LAYOUT_EAC3_7_1_C = (162 << 16) | 8,
MOV_CH_LAYOUT_EAC3_7_1_D = (163 << 16) | 8,
MOV_CH_LAYOUT_EAC3_7_1_E = (164 << 16) | 8,
MOV_CH_LAYOUT_EAC3_7_1_F = (165 << 16) | 8,
MOV_CH_LAYOUT_EAC3_7_1_G = (166 << 16) | 8,
MOV_CH_LAYOUT_EAC3_7_1_H = (167 << 16) | 8,
MOV_CH_LAYOUT_DTS_3_1 = (168 << 16) | 4,
MOV_CH_LAYOUT_DTS_4_1 = (169 << 16) | 5,
MOV_CH_LAYOUT_DTS_6_0_A = (170 << 16) | 6,
MOV_CH_LAYOUT_DTS_6_0_B = (171 << 16) | 6,
MOV_CH_LAYOUT_DTS_6_0_C = (172 << 16) | 6,
MOV_CH_LAYOUT_DTS_6_1_A = (173 << 16) | 7,
MOV_CH_LAYOUT_DTS_6_1_B = (174 << 16) | 7,
MOV_CH_LAYOUT_DTS_6_1_C = (175 << 16) | 7,
MOV_CH_LAYOUT_DTS_6_1_D = (182 << 16) | 7,
MOV_CH_LAYOUT_DTS_7_0 = (176 << 16) | 7,
MOV_CH_LAYOUT_DTS_7_1 = (177 << 16) | 8,
MOV_CH_LAYOUT_DTS_8_0_A = (178 << 16) | 8,
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,
};
struct MovChannelLayoutMap { struct MovChannelLayoutMap {
uint32_t tag; uint32_t tag;
uint64_t layout; uint64_t layout;

104
libavformat/mov_chan.h
Unescape View File

@ -33,6 +33,110 @@
#include "libavcodec/codec_par.h" #include "libavcodec/codec_par.h"
#include "avformat.h" #include "avformat.h"
/**
* Channel Layout Tag
* This tells which channels are present in the audio stream and the order in
* which they appear.
*
* @note We're using the channel layout tag to indicate channel order
* when the value is greater than 0x10000. The Apple documentation has
* some contradictions as to how this is actually supposed to be handled.
*
* Core Audio File Format Spec:
* "The high 16 bits indicates a specific ordering of the channels."
* Core Audio Data Types Reference:
* "These identifiers specify the channels included in a layout but
* do not specify a particular ordering of those channels."
*/
enum MovChannelLayoutTag {
#define MOV_CH_LAYOUT_UNKNOWN 0xFFFF0000
MOV_CH_LAYOUT_USE_DESCRIPTIONS = ( 0 << 16) | 0,
MOV_CH_LAYOUT_USE_BITMAP = ( 1 << 16) | 0,
MOV_CH_LAYOUT_DISCRETEINORDER = (147 << 16) | 0,
MOV_CH_LAYOUT_MONO = (100 << 16) | 1,
MOV_CH_LAYOUT_STEREO = (101 << 16) | 2,
MOV_CH_LAYOUT_STEREOHEADPHONES = (102 << 16) | 2,
MOV_CH_LAYOUT_MATRIXSTEREO = (103 << 16) | 2,
MOV_CH_LAYOUT_MIDSIDE = (104 << 16) | 2,
MOV_CH_LAYOUT_XY = (105 << 16) | 2,
MOV_CH_LAYOUT_BINAURAL = (106 << 16) | 2,
MOV_CH_LAYOUT_AMBISONIC_B_FORMAT = (107 << 16) | 4,
MOV_CH_LAYOUT_QUADRAPHONIC = (108 << 16) | 4,
MOV_CH_LAYOUT_PENTAGONAL = (109 << 16) | 5,
MOV_CH_LAYOUT_HEXAGONAL = (110 << 16) | 6,
MOV_CH_LAYOUT_OCTAGONAL = (111 << 16) | 8,
MOV_CH_LAYOUT_CUBE = (112 << 16) | 8,
MOV_CH_LAYOUT_MPEG_3_0_A = (113 << 16) | 3,
MOV_CH_LAYOUT_MPEG_3_0_B = (114 << 16) | 3,
MOV_CH_LAYOUT_MPEG_4_0_A = (115 << 16) | 4,
MOV_CH_LAYOUT_MPEG_4_0_B = (116 << 16) | 4,
MOV_CH_LAYOUT_MPEG_5_0_A = (117 << 16) | 5,
MOV_CH_LAYOUT_MPEG_5_0_B = (118 << 16) | 5,
MOV_CH_LAYOUT_MPEG_5_0_C = (119 << 16) | 5,
MOV_CH_LAYOUT_MPEG_5_0_D = (120 << 16) | 5,
MOV_CH_LAYOUT_MPEG_5_1_A = (121 << 16) | 6,
MOV_CH_LAYOUT_MPEG_5_1_B = (122 << 16) | 6,
MOV_CH_LAYOUT_MPEG_5_1_C = (123 << 16) | 6,
MOV_CH_LAYOUT_MPEG_5_1_D = (124 << 16) | 6,
MOV_CH_LAYOUT_MPEG_6_1_A = (125 << 16) | 7,
MOV_CH_LAYOUT_MPEG_7_1_A = (126 << 16) | 8,
MOV_CH_LAYOUT_MPEG_7_1_B = (127 << 16) | 8,
MOV_CH_LAYOUT_MPEG_7_1_C = (128 << 16) | 8,
MOV_CH_LAYOUT_EMAGIC_DEFAULT_7_1 = (129 << 16) | 8,
MOV_CH_LAYOUT_SMPTE_DTV = (130 << 16) | 8,
MOV_CH_LAYOUT_ITU_2_1 = (131 << 16) | 3,
MOV_CH_LAYOUT_ITU_2_2 = (132 << 16) | 4,
MOV_CH_LAYOUT_DVD_4 = (133 << 16) | 3,
MOV_CH_LAYOUT_DVD_5 = (134 << 16) | 4,
MOV_CH_LAYOUT_DVD_6 = (135 << 16) | 5,
MOV_CH_LAYOUT_DVD_10 = (136 << 16) | 4,
MOV_CH_LAYOUT_DVD_11 = (137 << 16) | 5,
MOV_CH_LAYOUT_DVD_18 = (138 << 16) | 5,
MOV_CH_LAYOUT_AUDIOUNIT_6_0 = (139 << 16) | 6,
MOV_CH_LAYOUT_AUDIOUNIT_7_0 = (140 << 16) | 7,
MOV_CH_LAYOUT_AUDIOUNIT_7_0_FRONT = (148 << 16) | 7,
MOV_CH_LAYOUT_AAC_6_0 = (141 << 16) | 6,
MOV_CH_LAYOUT_AAC_6_1 = (142 << 16) | 7,
MOV_CH_LAYOUT_AAC_7_0 = (143 << 16) | 7,
MOV_CH_LAYOUT_AAC_OCTAGONAL = (144 << 16) | 8,
MOV_CH_LAYOUT_TMH_10_2_STD = (145 << 16) | 16,
MOV_CH_LAYOUT_TMH_10_2_FULL = (146 << 16) | 21,
MOV_CH_LAYOUT_AC3_1_0_1 = (149 << 16) | 2,
MOV_CH_LAYOUT_AC3_3_0 = (150 << 16) | 3,
MOV_CH_LAYOUT_AC3_3_1 = (151 << 16) | 4,
MOV_CH_LAYOUT_AC3_3_0_1 = (152 << 16) | 4,
MOV_CH_LAYOUT_AC3_2_1_1 = (153 << 16) | 4,
MOV_CH_LAYOUT_AC3_3_1_1 = (154 << 16) | 5,
MOV_CH_LAYOUT_EAC3_6_0_A = (155 << 16) | 6,
MOV_CH_LAYOUT_EAC3_7_0_A = (156 << 16) | 7,
MOV_CH_LAYOUT_EAC3_6_1_A = (157 << 16) | 7,
MOV_CH_LAYOUT_EAC3_6_1_B = (158 << 16) | 7,
MOV_CH_LAYOUT_EAC3_6_1_C = (159 << 16) | 7,
MOV_CH_LAYOUT_EAC3_7_1_A = (160 << 16) | 8,
MOV_CH_LAYOUT_EAC3_7_1_B = (161 << 16) | 8,
MOV_CH_LAYOUT_EAC3_7_1_C = (162 << 16) | 8,
MOV_CH_LAYOUT_EAC3_7_1_D = (163 << 16) | 8,
MOV_CH_LAYOUT_EAC3_7_1_E = (164 << 16) | 8,
MOV_CH_LAYOUT_EAC3_7_1_F = (165 << 16) | 8,
MOV_CH_LAYOUT_EAC3_7_1_G = (166 << 16) | 8,
MOV_CH_LAYOUT_EAC3_7_1_H = (167 << 16) | 8,
MOV_CH_LAYOUT_DTS_3_1 = (168 << 16) | 4,
MOV_CH_LAYOUT_DTS_4_1 = (169 << 16) | 5,
MOV_CH_LAYOUT_DTS_6_0_A = (170 << 16) | 6,
MOV_CH_LAYOUT_DTS_6_0_B = (171 << 16) | 6,
MOV_CH_LAYOUT_DTS_6_0_C = (172 << 16) | 6,
MOV_CH_LAYOUT_DTS_6_1_A = (173 << 16) | 7,
MOV_CH_LAYOUT_DTS_6_1_B = (174 << 16) | 7,
MOV_CH_LAYOUT_DTS_6_1_C = (175 << 16) | 7,
MOV_CH_LAYOUT_DTS_6_1_D = (182 << 16) | 7,
MOV_CH_LAYOUT_DTS_7_0 = (176 << 16) | 7,
MOV_CH_LAYOUT_DTS_7_1 = (177 << 16) | 8,
MOV_CH_LAYOUT_DTS_8_0_A = (178 << 16) | 8,
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,
};
/** /**
* Get the channel layout tag for the specified codec id and channel layout. * Get the channel layout tag for the specified codec id and channel layout.
* If the layout tag was not found, use a channel bitmap if possible. * If the layout tag was not found, use a channel bitmap if possible.

Write Preview
Loading…
Cancel
Save