From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id B4A6C4372F for ; Fri, 28 Oct 2022 12:23:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2EBF568BCF9; Fri, 28 Oct 2022 15:22:53 +0300 (EEST) Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4514768BCF0 for ; Fri, 28 Oct 2022 15:22:46 +0300 (EEST) Received: by mail-oi1-f172.google.com with SMTP id u132so6015906oib.0 for ; Fri, 28 Oct 2022 05:22:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=NxRLMlzzB4DBglSzM7/sGg+p6x70hoQurK3SfdJQVco=; b=BFW7XLOZkJ5Sa3Bt2NHthdMP6NL59BIM2iP46QQSvgDoe6a/6xMGSsa6APMz7wXYY3 ua/+FWBNVJVfG+R3IlOEtP0egzPXOjvG69INp8PD0l5KkpYQIujnoTZCK44ZjKoXIWuP jS1QseG9YgnGoB1FY3UfrwQfa962gx81lIykxLJXeSZLUL6CjyuEStvpv5GKzq17Oog6 MIQFvvXcnO71TmjiUczbZa/pGWzZiJ4z+Al22nyk9ge+Dx+P/xpf6BpsEYlsdFS1L9nb f5398o1jANyG044CexrndpIxRAxDuorCMhsDqmLGJUvkRYvz8zeirVS9suqVbHrJOMcy EcjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NxRLMlzzB4DBglSzM7/sGg+p6x70hoQurK3SfdJQVco=; b=iGPdeOWUnBIBrC2EjMLbkcSQzd1RVBB1qgCTXIRr21KRW8KqQRSCTnhO5AaKU+jQB2 LPHm87+/znzy8oXnSIACemLvZmAsvD8pjf7esMnLVrMEr3J5DnOMaRr7k9hgLt7K6tGX azgFesEzmBZMvrV2OKFxPsYeWBN8o8NZ0eHlB2SBlk+ZNParmyHaCuXqNimsJgr0a1Ss Wc9jAtRctrTVQmBLWW2dcKvp8VJMGrY8PScOIv0EeshIkshlI+oNRpABnommKXz9lAgh d+ra29kXOMUv9T62COwvB/7mNAUd+pTQMFHYWPXsboqNsxVdlUTGP1nypa1RdBZYbCuT p3Vw== X-Gm-Message-State: ACrzQf3PZykTPWz9cOdkIVg12E4DmwLGGRcszlTpEhxR13XNaE2JzXZq luoJSr6Efuh6e1AVwogy7Sk7M8T9RJc= X-Google-Smtp-Source: AMsMyM6bmF9wzigVBb4EgHDd98Ye+O0+wSwI2nLZZgKAG8qceeO4gMBZa1ZpT5on5YtqIGnb7qRa+Q== X-Received: by 2002:a05:6808:1405:b0:355:7603:fa57 with SMTP id w5-20020a056808140500b003557603fa57mr7661544oiv.82.1666959764683; Fri, 28 Oct 2022 05:22:44 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id v206-20020acaacd7000000b0035028730c90sm1458869oie.1.2022.10.28.05.22.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 05:22:44 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Oct 2022 09:21:40 -0300 Message-Id: <20221028122140.1885-4-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221028122140.1885-1-jamrial@gmail.com> References: <20221028122140.1885-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/mov_chan: add missing AAC 7.1 mappings 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- libavformat/mov_chan.c | 5 +++++ libavformat/mov_chan.h | 2 ++ 2 files changed, 7 insertions(+) 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, }; /** -- 2.38.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".