From patchwork Fri Oct 28 12:21:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39030 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp754648pzd; Fri, 28 Oct 2022 05:23:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7VBCqa+6r/+t+Pcq4voBVSbJ0z90ZmwNxVWtXeTHTUBOwUrvkWlr1T5nlDI8Kq4ULh6qhQ X-Received: by 2002:a05:6402:3408:b0:43c:2dd3:d86b with SMTP id k8-20020a056402340800b0043c2dd3d86bmr50563967edc.108.1666959797364; Fri, 28 Oct 2022 05:23:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666959797; cv=none; d=google.com; s=arc-20160816; b=SPE+G6nr7T6Yxz7sXQXFrMq/kn/1x3WxCYRaH8S66l6s+ZDML90l2ifb/PQaU8b56t QuaVOuz4kwvluP3KQFIdaUYzV9t75hcdtxML9EdeblnyNB0+SvqjmYZwWgVHXRsFFpJP vHkeBq+pIfKxpiqYc4esADrwrna+kbnqeV0ElMj0ke/hE65K6vLEwgsWsveVbV84o288 BkWm1bwjze/jZLI7Gges48xcOiRL4pVqBDvQqzBkr8NLrULneiG+cKzIQKmzo3Fu+zSY VSrlM+dRboTUN/lLmaWi983c+dwr2E4/IDVnEPj6fOdcK3yATh+iwBEHvlVe5Vzrtzdt fpqQ== 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=DU7oqctUONw4H+K4FFKRzo3WWuf5r6gNNjCj0kn8+G0=; b=k+Gy0IrQi+UpQXWEWDBVC4BvV4NUyl0wHhYbuu/tynKzru0pWtwVSyo4iVgxlIQfYB 0tQyK9MQAN4jdjhZl5rw1w/tNbQW+yBtxM9K0rAU4b6kEoBPIb1+eVpgp6CXVxqVAyBr Sib7HX7anOfcjVygylEspiUTStPKuwLBnju69Z4wIyDXLkj/SGXSBE/9LRvnedcJKPty +m8mIE7bjDXyBNTekM4WAZ7bZMIjBxi9+cWszi/iqKqFAs0B8qOszT15/3KybuQWxhuQ J7b1Hb7HS2dYOheOAqPEXCFcBVzD1d8KIHOEM+n5fTlhu89HQp+TMoHU5duQpOcq2gUh SLhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BFW7XLOZ; 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 ez15-20020a1709070bcf00b0078dbec0aa81si3504652ejc.214.2022.10.28.05.23.16; Fri, 28 Oct 2022 05:23:17 -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=BFW7XLOZ; 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 5ECF168BCFA; Fri, 28 Oct 2022 15:22:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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-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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /Vut9OYUhtjH 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, }; /**