From patchwork Tue Oct 24 00:33:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44340 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1b28:b0:15d:8365:d4b8 with SMTP id ch40csp1751435pzb; Mon, 23 Oct 2023 17:35:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEwjD6fRr5X1sg8KbQWUBq4qlksph51i3ow1+IwjKaEnlbil3Sm+2e0PyIHqs729XA0xdGY X-Received: by 2002:ac2:5bd0:0:b0:507:9a0b:3fd7 with SMTP id u16-20020ac25bd0000000b005079a0b3fd7mr7499341lfn.13.1698107724812; Mon, 23 Oct 2023 17:35:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698107724; cv=none; d=google.com; s=arc-20160816; b=lS9YG4wkuJfkprcKTVPq2E+nQB0FOWTtJu09qqL6hkwIPuYevtMJFDJ1pFW5jczojM HRSdlSAQInYK+fZDLE351nQxhj3jLjvb7Di2x+w/uwfmcqw7qJGmdXwBPA9xHtTxrKrF +afcMBs2VfCm0kVysMFkmlNUXmeRrUj31uruCQOh/WH1jbzp90YKb61yDTKz973qt016 qiYZf54q9yGBZBHhrX2Svn4RGcOwkt4xCG6r58bQjFiJB/kIKHe9ym6yNWIp4aeboplp oloqG+TjdzzzMjBdZEryzZunifehCb4SbZtat7nqwLCSVrbcfdLaTfCgy2toFMDdY4XY earA== 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=TTXxY5tlohiOEA3oqCQi8+sB56x4LNu3P1Jq6xG44vw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=zvslTZcA6Tvp1GeJISZZJEBrsgkxOb3BvTgbgccxHXfvjEqnc09KKGEcSNYHEzt5Ij HxTgbFRctWY/qVdbgikVzoX49QMh46Xx3zsUQnnInfUbUM9HdZc53RcHiv17IPQQ1vYm Gvjg0ctxjmJGFHUQY/DzwUkj2PyZcgDMHf2l3QcfGU4WTONrjpFXiU4/lVhQbVL6gVuI uUK7rcvrgNAwQmHMeTQ7fnvVIPCm5HYi5jQD/glbeSqZzIClcHxVvnbcdTUWuT/DkJUk CzM+Yvbzixq6rYvdSWTqtTRhnaqSVg6PSvtAMeqWqX1r4VVA7YxI9bhDDS4DGLjAx+i2 lDXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=mCoKe3FR; 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 n16-20020a5099d0000000b0053e3e916bc1si3989465edb.246.2023.10.23.17.35.24; Mon, 23 Oct 2023 17:35:24 -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=mCoKe3FR; 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 6A4A368C825; Tue, 24 Oct 2023 03:35:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E456268C825 for ; Tue, 24 Oct 2023 03:35:13 +0300 (EEST) Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-3b2b1ad7ee6so2549211b6e.2 for ; Mon, 23 Oct 2023 17:35:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698107712; x=1698712512; 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=8bEYNxUpZplTSEVaBvWhYMp00CP4Ppf4XqZzpKhnVs8=; b=mCoKe3FRZr3OaSTpTD7btPMc1K+btc00l4tPlTQI0fMzms5bzx3LS09Jr6xt4N+hiX fCIy88no5p/y/RZHP3nS9ajZC/rx3C7dLdY4oulreJ5hJGaeGZ8AxI3zcCDM7fs2JgWU C/WpvNogoRa7x8MR6ZdDMFltCH21eslC1elJXTZjE0eTtuyoMX95I+pkZEX+xjrYs/wW P9eqA7Vs6XGwaK7fOYM1pK3WEe73BFR3u+D069Wl9qqrOb36eAMZa3CRe6cXNNHcerOe PaABP2scV6qbOxYm43bHiMG8YI2FWkQ4RZEUOS6npzw2GXz0oPSxD17eOcra3ZkwfHOX tpoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698107712; x=1698712512; 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=8bEYNxUpZplTSEVaBvWhYMp00CP4Ppf4XqZzpKhnVs8=; b=a3dwEQefjrx5F0TwjccbA2h6i3m3KxUvMtEhJ/aGqQec8ilQQB5WGgZTP7r0541W// mBOCocmikTt/YwXlCSFHmHF4I7LgkbgQ4UbKHjEFONZ6fXRD24n6PI0TelyyLNMQKUEP GJ+lkShIPt3pW6KN+lSNnzFw2jwgB5sv4S5kxjFEPpidh5ohvosSOSjB/LRlI/6JWvzk PvK7iWlsbXho1Jb/WwRHFWzzd6V2dlzwO2JOiEouz05hIlqw2f1WqSn6q3x+bkuhbRzg g5Wp8mLm6/6O1r2voFkv2Lxe53RXwZPfU/mEYZE9jnS6KBojmy67rqFInV3whhXcKGPU 54SQ== X-Gm-Message-State: AOJu0YxzLCRDxcDMmpmaoXmx8Gn3i2WQ7+y2tIGn8vDUDvWxnDVrfVNr ZPrwLOaN3fJmHn487ZttVqtZ4jhbOVY= X-Received: by 2002:a05:6808:96:b0:3a7:d566:8b5e with SMTP id s22-20020a056808009600b003a7d5668b5emr11104682oic.44.1698107711671; Mon, 23 Oct 2023 17:35:11 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id y15-20020aa793cf000000b006883561b421sm6675709pff.162.2023.10.23.17.35.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 17:35:11 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Oct 2023 21:33:47 -0300 Message-ID: <20231024003349.8966-1-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: W67Zo8KfvClT 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..558def4b9e 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_BACK }, { "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..74e6889152 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_BACK (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_BACK AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_5POINT1POINT2_BACK) #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_BACK + #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