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