From patchwork Mon Mar 28 23:24:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 35037 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp626094pzb; Mon, 28 Mar 2022 16:26:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycOldUzqj8R8a601tMCU7//aznuuPlNpwyjbXi7t4b682X4alHKelpRGui7EzGJVvbnVSU X-Received: by 2002:a50:c307:0:b0:418:ec3b:2242 with SMTP id a7-20020a50c307000000b00418ec3b2242mr408612edb.229.1648510010338; Mon, 28 Mar 2022 16:26:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648510010; cv=none; d=google.com; s=arc-20160816; b=kmqqUz32A0Xdx+h3xl/2utbQtVvaZhvRtjGGfvqIVfaLbwZ8FifkdZq3uF0koTjAvU x+9Se0CPQqSPdrLGcR0MYKT55lyGlPcw78d/+LRCQNm5dG1XZbdYai6cCDbqtlrQpRbR NjR2t1vypi3wAI2YI9GRbD6iiewINnnBFkt/Q6YukOBs0YcOV0XQPPVcNLnMCBtwL538 g7EWph9/O5JMqGVYC6zz/7mRkuYXbVYT5pBlPhgdF0A/3cXcyMEgPnfk5HloAhivMEsq WTvg2mZkfJJT+5cSaFfWghmUWerhfZcyggZrcV816+y+RaCee0RHafdmsYtpamQhdtOG ZIhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Envk0R7SQAq/bab1xwlp0ZTZcws2i11aVswulEUh9q4=; b=yZluocOZnZ5sdw0m3JLASWhkkMQnjA6C0sCgYKFKR3AxM4Y/jbYrq031ThE01s+Euv QcLZgPrZu/J+9zbfsISYyjdTmeO4ndJDUiis3a2d/nbxzvCAhySXxo1OZQxBTCo3zXIU kBvZqM/q1Z80cGTpIy01mxCpRrdKaU1V3eUAgN0dWWvDayhVzoZjhRnR1iWNwlX1GHuo zYrb+8f3GfzlH8Y9NbxSKv70Pb8TS0V5Z2nEy/lNHZdfI2bCEOwCVVZIIzH/eSjvXj5n jmSkQDlKPYFgL+71E8hHijqfDJpeRITPR2omqWgGgzdhW331LwxiolTdGjmHft0epWUm zd+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=l5xGFnYk; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b25-20020aa7dc19000000b00418fd7af8fasi14702340edu.416.2022.03.28.16.26.49; Mon, 28 Mar 2022 16:26:50 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=l5xGFnYk; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2135568B2C6; Tue, 29 Mar 2022 02:25:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f54.google.com (mail-oa1-f54.google.com [209.85.160.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F15B68B2CD for ; Tue, 29 Mar 2022 02:25:51 +0300 (EEST) Received: by mail-oa1-f54.google.com with SMTP id 586e51a60fabf-deb9295679so9697557fac.6 for ; Mon, 28 Mar 2022 16:25:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=olvIinXL1Ng3bguHSxo8aVh67K8vp57bUQk0DUk3I3o=; b=l5xGFnYk0JbMYGvA2yhfJPeBzroQzuiwHXjhHzzdQGSja6N7SSgZam8U6dzZvt0MQO SkCxmFnFXfKn8w76q3oiHcfmbVRO7ixaJcAvp3jGrPE928sXdgTdwyAMXnES2NfdAgrl tQqNUL7YdHVFYT8gAhTIDhphllMNsbUN+o3xT95kLzrkm0kG/S5wDdyigZc/pg1xtagH +Sx3aZ4iZLxK0bYlOxLXLdG3oIg2R3pnfHnpGjmysWVe+WA0wgT+U1jKqdPTSnAADGXO +vGnyt1887rXZMPOvHuOhT23UAFVfwn2YUENXhyDj03vwGZGhtjy9sKRohRB66VOyVp5 SfLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=olvIinXL1Ng3bguHSxo8aVh67K8vp57bUQk0DUk3I3o=; b=7VPqDSMUOxy6pA7p7zTMbx6MI+IkKt4ZikDIrUF3sSQ7BklO+wDWZi27dNr8IoPb2P /ipX0EPNbioIHa9ZrfCuTKPABqV043SRoo7s1igeoZoetJndWixHiLib4fzRuJI17st7 coWC+8JWrlrEOIOMkcodVyteZES8MT7XNkXJa5d+ea3CUIhT3sdeG9D6kDlWrPEx03M2 6TKHfIZKK6EwFD/t8P8pTVPlbF40ZqCgaaJVjsrfEuzNnPpKotHn6gHNtZezDOEN32N+ ocOnfHp3DDBcV5MeTEsFfsYnuPntyMaN6g7Vg9DXea0IMjlvuL9qwxVIOHsquYeuCmoH xGYg== X-Gm-Message-State: AOAM530+WSKavOFqiOKYPCFkFqZ81ZHn6+mJ3b4/8FJZnFjiQLQM5CvJ eiF8/bnTW9ebZ1hfyX/n3sYlO6ke0LTH5A== X-Received: by 2002:a05:6870:c101:b0:da:b3f:2b89 with SMTP id f1-20020a056870c10100b000da0b3f2b89mr791524oad.296.1648509949489; Mon, 28 Mar 2022 16:25:49 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id gk6-20020a0568703c0600b000de4880b357sm7198456oab.50.2022.03.28.16.25.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 16:25:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 20:24:51 -0300 Message-Id: <20220328232453.54773-5-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220328232453.54773-1-jamrial@gmail.com> References: <20220328232453.54773-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/7] avformat/mov_chan: move the definition of MovChannelLayoutTag to the header X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rQhACZ7D4FNZ Signed-off-by: James Almer --- libavformat/mov_chan.c | 104 ----------------------------------------- libavformat/mov_chan.h | 104 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 104 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index 4cb373d1b9..5b757c6a8a 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -29,110 +29,6 @@ #include "libavcodec/codec_id.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 { uint32_t tag; uint64_t layout; diff --git a/libavformat/mov_chan.h b/libavformat/mov_chan.h index 2815f15f07..93d9878798 100644 --- a/libavformat/mov_chan.h +++ b/libavformat/mov_chan.h @@ -33,6 +33,110 @@ #include "libavcodec/codec_par.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. * If the layout tag was not found, use a channel bitmap if possible.