From patchwork Mon Oct 23 23:23:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44337 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1b28:b0:15d:8365:d4b8 with SMTP id ch40csp1724459pzb; Mon, 23 Oct 2023 16:24:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGAx3MPtGILJZ2kvayEHHKKhZOzMOxhBAwyEbo167IIvh5VWiCXC7eT9iVS0HSvFKybl5uq X-Received: by 2002:a50:a6d5:0:b0:53e:1721:146b with SMTP id f21-20020a50a6d5000000b0053e1721146bmr7655825edc.28.1698103446404; Mon, 23 Oct 2023 16:24:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698103446; cv=none; d=google.com; s=arc-20160816; b=ffwMQaIR9qwJqXjkMLP3Q18gJUOgRVIh1JSAV/Lk3fEymHk/u66FefUP7fcAW75Cbq tnsg7cem3QkZckk0BSylEh9nT8lWmFnQGrTSgyhu+nPew7CdmT9voA7su5iRFxjCJ7QX Mv9L6g/Gspd/3rnx5SbBu7h4TEo8mgBsMA1e+wousQfTh4V9yZesf/QVkk2qsnSX1R2x 96WPwD3Q3YLmb5Mfa8FLhnAW63KGhkbScvE9rAY7aWPnxF0v/nlXgJnmSpjeJVS8vWl2 ZKIcrMtFOAZBCkNN9KEE+we9twYLRraX9LRj31LZW1v8oV5n6BinJBKdTC5hB4k1B/fA lv2A== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=l3VopA7vnkDVcNFBZJvtEMJbDjKJxTueYbl2Zjkip+E=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ldQW885fS0H4jTG3el6scoZ9HwNcojH7dtvgt2oD4aMahlvjV7GhhcOF4zA/B7bvle rfCY5pojfh8+Gcv5oyOdExD3iVdxh+yV2ZFzdI5ABh/N2sF+Aw41yDGwOJrgK1D359TH QHJA1BDotIZzkSo4r+ZsU7m2YLX/3O6i3tXyjHzzp2nTFPmK9415qwWaBFVsi27GwKrz q5ZQYS74Cos9vPLkVVpInCT+tYQOZvzBp2vwdrDZV6w+wvgH4GkT6Bi4BfZj+we4TrTE xXKCQ+iU8oR43/+KtLBbYRy6Knt5lqDEn0u1+2YZst01YHkE9/ZCCvCKnxnubG+34jK7 /cig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=hEHH8IeL; 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 15-20020a50874f000000b0053e5243e180si2580867edv.239.2023.10.23.16.24.05; Mon, 23 Oct 2023 16:24:06 -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=20230601 header.b=hEHH8IeL; 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 4465D680B12; Tue, 24 Oct 2023 02:24:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2DCD4680B12 for ; Tue, 24 Oct 2023 02:23:55 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6b77ab73c6fso2804370b3a.1 for ; Mon, 23 Oct 2023 16:23:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698103433; x=1698708233; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=ZN67EjLW2xiMcY/7MmU+mMZM+CohJ0xGyNFTlFsKps8=; b=hEHH8IeLKwAR6CBOUuihPTPJJVv+kvweaFrGKqDYIbkAx4YKytQOD4YMGSNGUryEJU YyB3AxmGpsgsvMl/jGQZ70v5+SP/OVWyFTiHk6bPh7RsrU0q4jjTuir1llpAuJAcdMl1 AcspWx3B5zOy4pu3paxLACo65MsCE+DouOMA/5zxiUKP5NRuSU7027jgO+X4Sp/nZ54n EUGy95q5BCvkZW3T3R/7wI36fhYompMIx2rb9vNuHcznqJfL0JIgwsIAbiX1huP9s5+j oIvmiR3cTJF3QN2fvnDPzP+MSJDhM9uCVJp4gQg+4SOP9Q6XcHFZiBSNvMU7mXItA91S GiEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698103433; x=1698708233; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZN67EjLW2xiMcY/7MmU+mMZM+CohJ0xGyNFTlFsKps8=; b=RFKtdVP9TShQe2Px2d3AU3etp2YeTdNKsb4HXPr4PSEmYm05pnTYHfAI3e291WCJqE 3A4JOsu85tCn2VeIL1vrHvWvoxOHY51C5XVwEEZbN17BrvOeff5n6pq0QB+y8innhWUC 4yPDZYjRr/eUzlMazSafNpA77lzTXh1gd0Fi2rSTqj9Exy4uyUBU9NTXDy5vBkhkKXn3 DCfbCeZOIMUBV2N2t7EG47rV4zwkOduH5U892APYBWJuGPN0fNcY95CzmpkDM+pif6ES dtm7C4gVWdpjOqsx6SFIFpdEmRvt/NCFITX9CjS2L+nnUJWNcfL39te261TIUhHsHP9q T4wg== X-Gm-Message-State: AOJu0Yx5MdW4CD7WLsy26fukXh9DLxfe/KgUn0wKTLWb1E0p18yhNW0i 6cdujNqIv5Bi8ZovmJ8P22YNAuhbZ/0= X-Received: by 2002:a62:7911:0:b0:68b:e29c:b69 with SMTP id u17-20020a627911000000b0068be29c0b69mr12982703pfc.9.1698103432601; Mon, 23 Oct 2023 16:23:52 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id j6-20020a63ec06000000b0059b782e8541sm6300244pgh.28.2023.10.23.16.23.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 16:23:52 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Oct 2023 20:23:44 -0300 Message-ID: <20231023232346.8813-1-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avutil/channel_layout: rename 7.1(top) channel layout to 5.1.2 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: DSKqqyx1m55x This layout maps to ITU-R BS.2051-3 "Sound System C" and ITU-R BS.1196-8 "Channel Configuration 14", and it being the first layout with top layer channels, it's best to use a different scheme to properly convey the presence and amount of said channels. The new name will also be a better fit for the additions in the following commits. Signed-off-by: James Almer --- doc/utils.texi | 2 +- libavutil/channel_layout.c | 2 +- libavutil/channel_layout.h | 8 ++++++-- tests/ref/fate/channel_layout | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/doc/utils.texi b/doc/utils.texi index 8e8bfa76d4..1388e5dabe 100644 --- a/doc/utils.texi +++ b/doc/utils.texi @@ -713,7 +713,7 @@ FL+FR+FC+LFE+BL+BR+SL+SR FL+FR+FC+LFE+BL+BR+FLC+FRC @item 7.1(wide-side) FL+FR+FC+LFE+FLC+FRC+SL+SR -@item 7.1(top) +@item 5.1.2 FL+FR+FC+LFE+BL+BR+TFL+TFR @item octagonal FL+FR+FC+BL+BR+BC+SL+SR diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index 9b581ae6b3..b259e75d37 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -200,7 +200,7 @@ static const struct channel_layout_name channel_layout_map[] = { { "7.1", AV_CHANNEL_LAYOUT_7POINT1 }, { "7.1(wide)", AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK }, { "7.1(wide-side)", AV_CHANNEL_LAYOUT_7POINT1_WIDE }, - { "7.1(top)", AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK }, + { "5.1.2", AV_CHANNEL_LAYOUT_5POINT1POINT2 }, { "octagonal", AV_CHANNEL_LAYOUT_OCTAGONAL }, { "cube", AV_CHANNEL_LAYOUT_CUBE }, { "hexadecagonal", AV_CHANNEL_LAYOUT_HEXADECAGONAL }, diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h index ac2ddfa022..8c40c81b44 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -232,13 +232,15 @@ enum AVChannelOrder { #define AV_CH_LAYOUT_7POINT1 (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT) #define AV_CH_LAYOUT_7POINT1_WIDE (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) #define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) -#define AV_CH_LAYOUT_7POINT1_TOP_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT) +#define AV_CH_LAYOUT_5POINT1POINT2 (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT) #define AV_CH_LAYOUT_OCTAGONAL (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT) #define AV_CH_LAYOUT_CUBE (AV_CH_LAYOUT_QUAD|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT) #define AV_CH_LAYOUT_HEXADECAGONAL (AV_CH_LAYOUT_OCTAGONAL|AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT) #define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT) #define AV_CH_LAYOUT_22POINT2 (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER|AV_CH_BACK_CENTER|AV_CH_LOW_FREQUENCY_2|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_CENTER|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_SIDE_LEFT|AV_CH_TOP_SIDE_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_BOTTOM_FRONT_CENTER|AV_CH_BOTTOM_FRONT_LEFT|AV_CH_BOTTOM_FRONT_RIGHT) +#define AV_CH_LAYOUT_7POINT1_TOP_BACK AV_CH_LAYOUT_5POINT1POINT2 + enum AVMatrixEncoding { AV_MATRIX_ENCODING_NONE, AV_MATRIX_ENCODING_DOLBY, @@ -398,13 +400,15 @@ typedef struct AVChannelLayout { #define AV_CHANNEL_LAYOUT_7POINT1 AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_7POINT1) #define AV_CHANNEL_LAYOUT_7POINT1_WIDE AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_7POINT1_WIDE) #define AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_7POINT1_WIDE_BACK) -#define AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_7POINT1_TOP_BACK) +#define AV_CHANNEL_LAYOUT_5POINT1POINT2 AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_5POINT1POINT2) #define AV_CHANNEL_LAYOUT_OCTAGONAL AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_OCTAGONAL) #define AV_CHANNEL_LAYOUT_CUBE AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_CUBE) #define AV_CHANNEL_LAYOUT_HEXADECAGONAL AV_CHANNEL_LAYOUT_MASK(16, AV_CH_LAYOUT_HEXADECAGONAL) #define AV_CHANNEL_LAYOUT_STEREO_DOWNMIX AV_CHANNEL_LAYOUT_MASK(2, AV_CH_LAYOUT_STEREO_DOWNMIX) #define AV_CHANNEL_LAYOUT_22POINT2 AV_CHANNEL_LAYOUT_MASK(24, AV_CH_LAYOUT_22POINT2) +#define AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK AV_CHANNEL_LAYOUT_5POINT1POINT2 + #define AV_CHANNEL_LAYOUT_AMBISONIC_FIRST_ORDER \ { /* .order */ AV_CHANNEL_ORDER_AMBISONIC, \ /* .nb_channels */ 4, \ diff --git a/tests/ref/fate/channel_layout b/tests/ref/fate/channel_layout index b93f96dbb3..eece8293ad 100644 --- a/tests/ref/fate/channel_layout +++ b/tests/ref/fate/channel_layout @@ -24,7 +24,7 @@ hexagonal FL+FR+FC+BL+BR+BC 7.1 FL+FR+FC+LFE+BL+BR+SL+SR 7.1(wide) FL+FR+FC+LFE+BL+BR+FLC+FRC 7.1(wide-side) FL+FR+FC+LFE+FLC+FRC+SL+SR -7.1(top) FL+FR+FC+LFE+BL+BR+TFL+TFR +5.1.2 FL+FR+FC+LFE+BL+BR+TFL+TFR octagonal FL+FR+FC+BL+BR+BC+SL+SR cube FL+FR+BL+BR+TFL+TFR+TBL+TBR hexadecagonal FL+FR+FC+BL+BR+BC+SL+SR+TFL+TFC+TFR+TBL+TBC+TBR+WL+WR From patchwork Mon Oct 23 23:23:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44338 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1b28:b0:15d:8365:d4b8 with SMTP id ch40csp1724520pzb; Mon, 23 Oct 2023 16:24:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFhQUnhliVrmMAbNmwBj4ag/tXOanDSZdBA+fOB4ENradcnG1OObOtoh8Npg+lZ+LLpfNiR X-Received: by 2002:a17:907:2ce4:b0:9bd:a738:2bfe with SMTP id hz4-20020a1709072ce400b009bda7382bfemr8342781ejc.38.1698103456840; Mon, 23 Oct 2023 16:24:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698103456; cv=none; d=google.com; s=arc-20160816; b=Hnhqa0aKscIj80dRGl3PF/9pGEQ9xhqchaoKnOq9bvd6P4TEs5A0hK888MwcASn6Yt jSfNAZYNdeTS6HJmI54BGaCnPq6JiqeEN4RUUb2xGiXixGDGmaXrEZpK/S5lKPxNQFtb GveXm9/P4nB/hoCMwtyG9VOjGqD7wB3YcJPeYmRuyadsbPq6L+z3hlmAdiq/fNV4iw+t i96kDCvZ5GcKcejYWF08kUNDlLbAht2mKae2SAuOa9Bo/SfU6omPr01e/TqMDq+0hMe8 UGBNTf/xWA186ASO6O7yF99XVEf/3fWUI5xzCOVWzCxkqLDPcEIFANKrW4OJ6ebXnhy1 AOaQ== 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=92hj/NWtgzECfYpj5hjKh8WXps+fxDzRYaUplpkR+R4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=xV4C19cD9yfPpWZCVIppwgqV4Yr5OFab7Noi24+Gf4lu9FUKin+6uFeOtP3LaOM1AQ 7xp/SrOPoG4oxXPnMfCGH5SirnCns4IiF9SpcW7uyOY24l5ag86KX5/TIQQmV5ZaRYHE rDLSlUIk0TsbAAX01D9cmOHFNR+6jgS3IP4EZx3qonKGGMY1Bghf28nmCzpA2gPb5ZCw rlqj1cJMPHSsCbCDiTkwDVcnx13gml5d11cq9VH6GEg5vUYM1M3vPKfSBbfNuGNCvYr/ ccoa37YY1Kz4IEP/5dPC4O2jttBh29fbzERqrm5IdTyAInqoluQ6G2R8cbOCUWrQocJF D6wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=EkEoSeS2; 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 v23-20020a1709060b5700b009945658c5b9si3745155ejg.811.2023.10.23.16.24.16; Mon, 23 Oct 2023 16:24:16 -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=20230601 header.b=EkEoSeS2; 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 7570368CA51; Tue, 24 Oct 2023 02:24:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07FF3680B12 for ; Tue, 24 Oct 2023 02:23:56 +0300 (EEST) Received: by mail-oi1-f171.google.com with SMTP id 5614622812f47-3b2e22a4004so2791285b6e.3 for ; Mon, 23 Oct 2023 16:23:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698103434; x=1698708234; darn=ffmpeg.org; 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=2LfRkFj1eFz5+AP+c09cCQ1B/mQhz+cTfMgYpG06Yuo=; b=EkEoSeS2QDm0TU3nQBCpoexl0G/Z1jgieY0ixgi4x8T/1+rk5jPU26Ezb57duuqzK2 T/iYaNJpPIKWPpY51LsDD9jpQFkTpKtHsmARaYVjyYpO3CK2yqAy0nWg/GMnFE7O/0/h Q5EIULhYrlUc2kqaQLK9TJ2jTnNYGeaCVzAvgYa+qK8nJrfFGngJZBqGz5VJ6+zBkS98 d7Xiy77HtcejSSMl7bq/F5elTGKqTOCaUIUsKrJdJJScHZZ6oN97qZpxjLrRaHUKheJH vu4AZVjnFaAkIajMvC/IZao0tA3V0//i7yCvou093g19MI/RSGvcpXxleBDbMvAkV1WV gVOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698103434; x=1698708234; 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=2LfRkFj1eFz5+AP+c09cCQ1B/mQhz+cTfMgYpG06Yuo=; b=W4dUBMnn8n9poI2rlyiGh3PYrZz4iYngvVxjWOwabaTCPWqwJtT1DxEPEBYO0O5vSR SMMfi3j000cM6rJ8+CjpuhZ2jVZ8jt4IzwEzWDV4jcskrCFm5P65KNEc+8hHCB076X94 TIRxkqLL3Cte0VNAdcToLzYMEz1HKYTXmLlUqgymJO1BYElHP5VjTGjXYImdtNKTV7es dPUulETSCM3oUwZqQq6nKhO5iupblxqH1ob256wXZnt+MwkUfBWz5fYmy7KJ2fLFt4QX lETRq6GmvuG6Un/dStYfS4B7ndIDK0w5tHe6bNYTyk6SK64lvKItLFoLG2FG1pYKxAON zpNg== X-Gm-Message-State: AOJu0YzriH1Qo6KVjeeh6kreQ+UNH8ke0LwdjSPhy/v1Ngd6KVeZO+3k DID50OrS2sjcE0evZWdXD1OVseUCq5A= X-Received: by 2002:a05:6808:8c9:b0:3ab:84f0:b49d with SMTP id k9-20020a05680808c900b003ab84f0b49dmr11988178oij.3.1698103433919; Mon, 23 Oct 2023 16:23:53 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id j6-20020a63ec06000000b0059b782e8541sm6300244pgh.28.2023.10.23.16.23.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 16:23:53 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Oct 2023 20:23:45 -0300 Message-ID: <20231023232346.8813-2-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231023232346.8813-1-jamrial@gmail.com> References: <20231023232346.8813-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avutil/channel_layout: add a 5.1.4 channel layout 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: b1V3JYgnNjAv Mapping to ITU-R BS.2051-3 "Sound System D" and ITU-R BS.1196-8 "Channel Configuration 16". Signed-off-by: James Almer --- doc/utils.texi | 2 ++ libavutil/channel_layout.c | 1 + libavutil/channel_layout.h | 2 ++ tests/ref/fate/channel_layout | 1 + 4 files changed, 6 insertions(+) diff --git a/doc/utils.texi b/doc/utils.texi index 1388e5dabe..bd71fb59c4 100644 --- a/doc/utils.texi +++ b/doc/utils.texi @@ -719,6 +719,8 @@ FL+FR+FC+LFE+BL+BR+TFL+TFR FL+FR+FC+BL+BR+BC+SL+SR @item cube FL+FR+BL+BR+TFL+TFR+TBL+TBR +@item 5.1.4 +FL+FR+FC+LFE+BL+BR+TFL+TFR+TBL+TBR @item hexadecagonal FL+FR+FC+BL+BR+BC+SL+SR+WL+WR+TBL+TBR+TBC+TFC+TFL+TFR @item downmix diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index b259e75d37..c6107c9ff2 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -203,6 +203,7 @@ static const struct channel_layout_name channel_layout_map[] = { { "5.1.2", AV_CHANNEL_LAYOUT_5POINT1POINT2 }, { "octagonal", AV_CHANNEL_LAYOUT_OCTAGONAL }, { "cube", AV_CHANNEL_LAYOUT_CUBE }, + { "5.1.4", AV_CHANNEL_LAYOUT_5POINT1POINT4 }, { "hexadecagonal", AV_CHANNEL_LAYOUT_HEXADECAGONAL }, { "downmix", AV_CHANNEL_LAYOUT_STEREO_DOWNMIX, }, { "22.2", AV_CHANNEL_LAYOUT_22POINT2, }, diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h index 8c40c81b44..1b0d9d0c3c 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -235,6 +235,7 @@ enum AVChannelOrder { #define AV_CH_LAYOUT_5POINT1POINT2 (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT) #define AV_CH_LAYOUT_OCTAGONAL (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT) #define AV_CH_LAYOUT_CUBE (AV_CH_LAYOUT_QUAD|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT) +#define AV_CH_LAYOUT_5POINT1POINT4 (AV_CH_LAYOUT_5POINT1POINT2|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT) #define AV_CH_LAYOUT_HEXADECAGONAL (AV_CH_LAYOUT_OCTAGONAL|AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT) #define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT) #define AV_CH_LAYOUT_22POINT2 (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER|AV_CH_BACK_CENTER|AV_CH_LOW_FREQUENCY_2|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_CENTER|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_SIDE_LEFT|AV_CH_TOP_SIDE_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_BOTTOM_FRONT_CENTER|AV_CH_BOTTOM_FRONT_LEFT|AV_CH_BOTTOM_FRONT_RIGHT) @@ -403,6 +404,7 @@ typedef struct AVChannelLayout { #define AV_CHANNEL_LAYOUT_5POINT1POINT2 AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_5POINT1POINT2) #define AV_CHANNEL_LAYOUT_OCTAGONAL AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_OCTAGONAL) #define AV_CHANNEL_LAYOUT_CUBE AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_CUBE) +#define AV_CHANNEL_LAYOUT_5POINT1POINT4 AV_CHANNEL_LAYOUT_MASK(10, AV_CH_LAYOUT_5POINT1POINT4) #define AV_CHANNEL_LAYOUT_HEXADECAGONAL AV_CHANNEL_LAYOUT_MASK(16, AV_CH_LAYOUT_HEXADECAGONAL) #define AV_CHANNEL_LAYOUT_STEREO_DOWNMIX AV_CHANNEL_LAYOUT_MASK(2, AV_CH_LAYOUT_STEREO_DOWNMIX) #define AV_CHANNEL_LAYOUT_22POINT2 AV_CHANNEL_LAYOUT_MASK(24, AV_CH_LAYOUT_22POINT2) diff --git a/tests/ref/fate/channel_layout b/tests/ref/fate/channel_layout index eece8293ad..194083fb71 100644 --- a/tests/ref/fate/channel_layout +++ b/tests/ref/fate/channel_layout @@ -27,6 +27,7 @@ hexagonal FL+FR+FC+BL+BR+BC 5.1.2 FL+FR+FC+LFE+BL+BR+TFL+TFR octagonal FL+FR+FC+BL+BR+BC+SL+SR cube FL+FR+BL+BR+TFL+TFR+TBL+TBR +5.1.4 FL+FR+FC+LFE+BL+BR+TFL+TFR+TBL+TBR hexadecagonal FL+FR+FC+BL+BR+BC+SL+SR+TFL+TFC+TFR+TBL+TBC+TBR+WL+WR downmix DL+DR 22.2 FL+FR+FC+LFE+BL+BR+FLC+FRC+BC+SL+SR+TC+TFL+TFC+TFR+TBL+TBC+TBR+LFE2+TSL+TSR+BFC+BFL+BFR From patchwork Mon Oct 23 23:23:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44339 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1b28:b0:15d:8365:d4b8 with SMTP id ch40csp1724572pzb; Mon, 23 Oct 2023 16:24:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFM3O8bC0F07cygLK2sGqZvei/0L/UO2DOo4L+1rUca+ZK4bKJciWD6HmDNJ9I8KnMcjRO7 X-Received: by 2002:a17:907:7da3:b0:9c3:cd12:1927 with SMTP id oz35-20020a1709077da300b009c3cd121927mr7867894ejc.5.1698103465031; Mon, 23 Oct 2023 16:24:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698103465; cv=none; d=google.com; s=arc-20160816; b=PLrFfkr1I/VlJbXIAotLp8mrxp2STWujVa+4zRvmCAkTt8FGER+vw0y2E0jhne6CSy XpkoMaxXr3jvjb2lAcu0rzYCjRo3xtGP1sEY+ZYXJHd3Z0TN88m9Ch4eybFQqQMQ9IXG JA6flSAZi/tWN3F9/SzIlx4NPInFHXgZ4sIa++Hk6DiQQAZ/WGHY4D0fUcTHIjNV/MB5 JbOPRyQsppVlDFbXvTHpFNfJ6B2eQ51j4W+Y/V87/Dypodu8DNz+r2jyGVI8efLjQ5q4 wqq0WVcHGMYZi4mMCU9vkvbCv/O8Fz/9/R2citJVNVty3g2nxrbwvtkqtb1rG8QM4bef S8tA== 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=Om4bWt8DwEnEO1Lti+blksl+LXMFiIntaMXYornhnpU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=BM3Ix4gwBVljxOPld0YJf/pmCi02mEDB0a+0mH/RosZCB+mKnrrHv2LFxn8Z+yrFfK NYOPY5OUTvZahLO+IT5asvhPpHs3u/t7jnmZGnhyuXxfha2lhaxHjAVp9CYh2gpVUtW8 aEQXaM6RxBMbOnm6mtHXOOYTTV3uko0ciA3utqHtKGPFnplRASXbDgZ7UGuKSx/JAq3u bA+2CnLhkklOb4/cd+3r9jJr8i7U8q7Il4k+DvK7LRtkdlhggjbK2lf8BINJidjc3iPS 4j1iZhGleT8GDSvQit/AxYyykgCFm7B0hKKvkGl/nxpG/WbKpJVXGjI9V+T0nukHrui5 OMHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=L5tmsJyo; 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 h25-20020a170906261900b009b2d534c166si3823648ejc.612.2023.10.23.16.24.24; Mon, 23 Oct 2023 16:24:25 -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=20230601 header.b=L5tmsJyo; 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 9738968CA6B; Tue, 24 Oct 2023 02:24:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f44.google.com (mail-oa1-f44.google.com [209.85.160.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EF2C68CA3C for ; Tue, 24 Oct 2023 02:23:57 +0300 (EEST) Received: by mail-oa1-f44.google.com with SMTP id 586e51a60fabf-1e9c9d181d6so2661324fac.0 for ; Mon, 23 Oct 2023 16:23:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698103435; x=1698708235; darn=ffmpeg.org; 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=PNsDb3K5h4TfX0ymH24z/jPPfNGfA9BjqDRsyfZsYkQ=; b=L5tmsJyoh7hk8i5xj22hgacZOGwS5+evJE5tg2nqo9RHosLHsrKz/lvvutfk/lbvJC eEfsqfeHiu6hn8VyzxF4XpcJF8OADOZONKmeBllcXbOSt3tuFHAOHQw9nxvO/pCTVLYe qOocS5rEbMw0LQc/HPX6eiWR/aO0HSqtyJ4bzACt8gJhecRVPB1J1M2wm+1mVthAPmv7 kipFb5QFRInDmnG7LlWTUOh2Dc5itg6WsEyWLmZIJJFW/EXtSTQuTacJzn16nzg3CcNc RYlLe+j7XhYjORZSE3Y9hYLadk8khnwpzcsPf4tuNtA9cj9B/GuKeg79JICCpB93IlH0 yY0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698103435; x=1698708235; 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=PNsDb3K5h4TfX0ymH24z/jPPfNGfA9BjqDRsyfZsYkQ=; b=DqyRMxXXRLmEIEEMWOmtnLe/9JBonfbhpTKS6nX6B25/yTXVuMJ8+t5CY4XfJWDPOI gpr/EwcZnkP3J8On7h9nTQgLRokrcFOgeu49YjTyUFhbkAgCgbSc4ny/Jo91XCTFX2Bv PpE/HSnrZYp+tOSAp96zcQKSWm0mM9/Vjc4tqCuWfYppzW8bdB8i8GBzrS31sazSjm04 oL9zCQP9tLo8frl/q0Ztc0Z9Ob7QZzvljdvWhmW+8FEYoxu83fQsEkZMcRg6K/SLIHY0 bllZRrSNaWIW3r7W5q0yq6jkGVDrNhzSO7kc+SnIbLmNauSDnTv/vAkzBf874cQXXpFg UYBQ== X-Gm-Message-State: AOJu0Yze1CiKOxs4l5SXskChqbdiLJHIpWKIesoxVOvcSxyWIo5x/hIP hI4hZWODCMuozK/vGrE1zFstkj0d4hU= X-Received: by 2002:a05:6870:b508:b0:1ea:7ec9:3dcd with SMTP id v8-20020a056870b50800b001ea7ec93dcdmr2145354oap.1.1698103435226; Mon, 23 Oct 2023 16:23:55 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id j6-20020a63ec06000000b0059b782e8541sm6300244pgh.28.2023.10.23.16.23.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 16:23:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Oct 2023 20:23:46 -0300 Message-ID: <20231023232346.8813-3-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231023232346.8813-1-jamrial@gmail.com> References: <20231023232346.8813-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avutil/channel_layout: add a 7.1.4 channel layout 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: K5iGMUxxZ3lZ From: Will Wolcott Mapping to ITU-R BS.2051-3 "Sound System J" and ITU-R BS.1196-8 "Channel Configuration 19". Signed-off-by: Will Wolcott Signed-off-by: James Almer --- doc/utils.texi | 2 ++ libavutil/channel_layout.c | 1 + libavutil/channel_layout.h | 2 ++ tests/ref/fate/channel_layout | 1 + 4 files changed, 6 insertions(+) diff --git a/doc/utils.texi b/doc/utils.texi index bd71fb59c4..91e648cfe5 100644 --- a/doc/utils.texi +++ b/doc/utils.texi @@ -721,6 +721,8 @@ FL+FR+FC+BL+BR+BC+SL+SR FL+FR+BL+BR+TFL+TFR+TBL+TBR @item 5.1.4 FL+FR+FC+LFE+BL+BR+TFL+TFR+TBL+TBR +@item 7.1.4 +FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBL+TBR @item hexadecagonal FL+FR+FC+BL+BR+BC+SL+SR+WL+WR+TBL+TBR+TBC+TFC+TFL+TFR @item downmix diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index c6107c9ff2..792d9cef35 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -204,6 +204,7 @@ static const struct channel_layout_name channel_layout_map[] = { { "octagonal", AV_CHANNEL_LAYOUT_OCTAGONAL }, { "cube", AV_CHANNEL_LAYOUT_CUBE }, { "5.1.4", AV_CHANNEL_LAYOUT_5POINT1POINT4 }, + { "7.1.4", AV_CHANNEL_LAYOUT_7POINT1POINT4 }, { "hexadecagonal", AV_CHANNEL_LAYOUT_HEXADECAGONAL }, { "downmix", AV_CHANNEL_LAYOUT_STEREO_DOWNMIX, }, { "22.2", AV_CHANNEL_LAYOUT_22POINT2, }, diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h index 1b0d9d0c3c..543908b267 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -236,6 +236,7 @@ enum AVChannelOrder { #define AV_CH_LAYOUT_OCTAGONAL (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT) #define AV_CH_LAYOUT_CUBE (AV_CH_LAYOUT_QUAD|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT) #define AV_CH_LAYOUT_5POINT1POINT4 (AV_CH_LAYOUT_5POINT1POINT2|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT) +#define AV_CH_LAYOUT_7POINT1POINT4 (AV_CH_LAYOUT_7POINT1|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT) #define AV_CH_LAYOUT_HEXADECAGONAL (AV_CH_LAYOUT_OCTAGONAL|AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT) #define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT) #define AV_CH_LAYOUT_22POINT2 (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER|AV_CH_BACK_CENTER|AV_CH_LOW_FREQUENCY_2|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_CENTER|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_SIDE_LEFT|AV_CH_TOP_SIDE_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_BOTTOM_FRONT_CENTER|AV_CH_BOTTOM_FRONT_LEFT|AV_CH_BOTTOM_FRONT_RIGHT) @@ -405,6 +406,7 @@ typedef struct AVChannelLayout { #define AV_CHANNEL_LAYOUT_OCTAGONAL AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_OCTAGONAL) #define AV_CHANNEL_LAYOUT_CUBE AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_CUBE) #define AV_CHANNEL_LAYOUT_5POINT1POINT4 AV_CHANNEL_LAYOUT_MASK(10, AV_CH_LAYOUT_5POINT1POINT4) +#define AV_CHANNEL_LAYOUT_7POINT1POINT4 AV_CHANNEL_LAYOUT_MASK(12, AV_CH_LAYOUT_7POINT1POINT4) #define AV_CHANNEL_LAYOUT_HEXADECAGONAL AV_CHANNEL_LAYOUT_MASK(16, AV_CH_LAYOUT_HEXADECAGONAL) #define AV_CHANNEL_LAYOUT_STEREO_DOWNMIX AV_CHANNEL_LAYOUT_MASK(2, AV_CH_LAYOUT_STEREO_DOWNMIX) #define AV_CHANNEL_LAYOUT_22POINT2 AV_CHANNEL_LAYOUT_MASK(24, AV_CH_LAYOUT_22POINT2) diff --git a/tests/ref/fate/channel_layout b/tests/ref/fate/channel_layout index 194083fb71..f42bea9a0a 100644 --- a/tests/ref/fate/channel_layout +++ b/tests/ref/fate/channel_layout @@ -28,6 +28,7 @@ hexagonal FL+FR+FC+BL+BR+BC octagonal FL+FR+FC+BL+BR+BC+SL+SR cube FL+FR+BL+BR+TFL+TFR+TBL+TBR 5.1.4 FL+FR+FC+LFE+BL+BR+TFL+TFR+TBL+TBR +7.1.4 FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBL+TBR hexadecagonal FL+FR+FC+BL+BR+BC+SL+SR+TFL+TFC+TFR+TBL+TBC+TBR+WL+WR downmix DL+DR 22.2 FL+FR+FC+LFE+BL+BR+FLC+FRC+BC+SL+SR+TC+TFL+TFC+TFR+TBL+TBC+TBR+LFE2+TSL+TSR+BFC+BFL+BFR