From patchwork Fri Nov 3 16:30:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44499 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:181:818d:5e7f with SMTP id q28csp676195pzh; Fri, 3 Nov 2023 09:30:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEcB2QspA+8gXqmvYppXpGOH+6Z4F5vLp7jQDCCZoChuaAST2xX9WUo3zFCgwX72FeWEb8J X-Received: by 2002:a17:906:c141:b0:9dd:82b4:4221 with SMTP id dp1-20020a170906c14100b009dd82b44221mr1002357ejc.2.1699029042878; Fri, 03 Nov 2023 09:30:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699029042; cv=none; d=google.com; s=arc-20160816; b=ostS0js9LtnoVKECQ49ZLjSucsMMrF1rE1mqVByv3OJtFGRvTrGeVxeDi2RKK+YE5x D9YQ6DZLaZPEHKJIu/3bOmy3FZnMenLK8kKmJIGKog5oHV5B5kMWE/jCMx3XmMr9ADKh kmYKyE31vc0XAT6gTrRO84r4aPN9OI+UHmUqbLibiucL2ChCaTk9YC/Sw5LwXdpjfijo qtfLaxlq54VH7xWak3IHR0VsYRMkbR5+wwsOMhyzxaMAcb2Vm8K4GdR9bG/TGya5BH9K mpt0KvcIx5fb+YUGQZdKu/PK0AtUYylsNGir7MQwuthnlePNFrJ0y93bohqfLsqW1//J tmeg== 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=KLYFoM45FjAEADLzUENFSM1Q1SsKKXfDu9+DIQeW8JY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=WMMKLbMKE3WQemBzhPSbrnbUWILm6SpZYgCwa47yUIp/zlPg/7Qt7B/VMJCkVujyTx bZqzJb/lgNd+NxdWoTpUFnhoDY4iCoOrsm51RxTN+rEUqQnehGpSc8SBU0pLU8IVCNQG 1OjmIWaxLodW3HXjZR5ZRpCPuLkFDl2Wc3iWEVTMSF7Mom/897oQZZWkzBmItEYcqVJI GhmO5PbmOqFT2W2xfuPFVwHyx5uaDYLsNcplQm5ZY3UVjfbKbPekszyvq07MYHGMl6pR P5cznPL7DED+8lLIHWVb8UKXuYq4ZbaEVRRvbOt4FmGuyKgVfu+g7cgj8MHoN3RLXuCP rxcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Kek8mSIR; 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 hv18-20020a17090760d200b009b2f9cc3e09si1108564ejc.443.2023.11.03.09.30.38; Fri, 03 Nov 2023 09:30:42 -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=Kek8mSIR; 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 2198A68CA66; Fri, 3 Nov 2023 18:30:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA00568CCCC for ; Fri, 3 Nov 2023 18:30:28 +0200 (EET) Received: by mail-qk1-f177.google.com with SMTP id af79cd13be357-77891c236fcso141567985a.3 for ; Fri, 03 Nov 2023 09:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699029026; x=1699633826; 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=s4jsfTZMpTSroa6p63Wq8yRuXPXOnr6ZlvUI5xa8rDs=; b=Kek8mSIRPd8xWT2mZ4tmCvyU8AJ4iDd5rec7CPGf9LlES/OHdSZUyk2DNlzrkFZREc F1rOKQL56Nfy2/tapzit+48kzn5tDVpmUCh3CyiQNQJvMbMIjUKPbEWGwnMtIhwTvOPH BeBegNZOuQwmyYVq4SRTqbbXcaRdWK9DYT/MrDN5GdqKdU8QvP9RECzgcZwBKF09S8IO zJsT3N/nFegLyK9aiql73YsuxrwJfpcfwaU2AscjoJcKieJqMQIuHRP8Asvj8toycJTD 6jP7+o89WdhTP6oOJ4DXpDEC9/2qL3k4sMwC4Yo5fZPYdGgRDRth4oY5uPkYxNni+MMN EW/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699029026; x=1699633826; 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=s4jsfTZMpTSroa6p63Wq8yRuXPXOnr6ZlvUI5xa8rDs=; b=R4dIfe97uYcPH0mSJSvHbAH95YUC53WVrB+D68sJet4Ii/6mexQXiOi2bTEy9vW76q NK5vZeeSKV0T2MyLWyy8UmmXDOAafjvMlV+gpAyMb85cvIivkb4aqNS3j3GSYh0LjT67 apmgCxQv/SzqxoMtAtcfPmNygP2bEMgDVOh5LYm3nqAmvMAmHiMOXXj2sQadQj+76oBr 9TXLWiShU2wulXqSysqtdc5KgyYyIs6VnNkItO24F4VfF/hXWCP6oRVNGZG/Uwt8z0PQ TTLOEMKCJDa6t46L7Jwle0m+jYFYWRZ1ebi3M1FS8Fq6K9/hxmUyRWb2EScZz53gix/Q /LiA== X-Gm-Message-State: AOJu0Ywm++vm48Om34+CxXqD5abCbSCRQydt8iD2n28URBkp3rrN/Uw0 kOaPKVzGpHHFnulhG4/Tb9hg/I1Wn5w= X-Received: by 2002:a05:620a:4305:b0:77a:75f7:d147 with SMTP id u5-20020a05620a430500b0077a75f7d147mr398478qko.18.1699029026557; Fri, 03 Nov 2023 09:30:26 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id bm21-20020a05620a199500b0077893a5a80esm859941qkb.123.2023.11.03.09.30.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 09:30:25 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Nov 2023 13:30:19 -0300 Message-ID: <20231103163020.2113-1-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avutil/channel_layout: add a 7.2.3 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: 2cHGfYmr0wmN Mapping to ITU-R BS.2051-3 "Sound System F" and ITU-R BS.1196-8 "Channel Configuration 15". 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 940d5381e3..0be20643de 100644 --- a/doc/utils.texi +++ b/doc/utils.texi @@ -727,6 +727,8 @@ FL+FR+FC+LFE+BL+BR+TFL+TFR+TBL+TBR FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR @item 7.1.4 FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBL+TBR +@item 7.2.3 +FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBC+LFE2 @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 1a36736b7f..acafdcc5e1 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -207,6 +207,7 @@ static const struct channel_layout_name channel_layout_map[] = { { "5.1.4", AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK }, { "7.1.2", AV_CHANNEL_LAYOUT_7POINT1POINT2 }, { "7.1.4", AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK }, + { "7.2.3", AV_CHANNEL_LAYOUT_7POINT2POINT3 }, { "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 c9c404ef18..052bf51c26 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -239,6 +239,7 @@ enum AVChannelOrder { #define AV_CH_LAYOUT_5POINT1POINT4_BACK (AV_CH_LAYOUT_5POINT1POINT2_BACK|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT) #define AV_CH_LAYOUT_7POINT1POINT2 (AV_CH_LAYOUT_7POINT1|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT) #define AV_CH_LAYOUT_7POINT1POINT4_BACK (AV_CH_LAYOUT_7POINT1POINT2|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT) +#define AV_CH_LAYOUT_7POINT2POINT3 (AV_CH_LAYOUT_7POINT1POINT2|AV_CH_TOP_BACK_CENTER|AV_CH_LOW_FREQUENCY_2) #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_7POINT1POINT4_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER|AV_CH_BACK_CENTER|AV_CH_LOW_FREQUENCY_2|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_CENTER|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) @@ -411,6 +412,7 @@ typedef struct AVChannelLayout { #define AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK AV_CHANNEL_LAYOUT_MASK(10, AV_CH_LAYOUT_5POINT1POINT4_BACK) #define AV_CHANNEL_LAYOUT_7POINT1POINT2 AV_CHANNEL_LAYOUT_MASK(10, AV_CH_LAYOUT_7POINT1POINT2) #define AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK AV_CHANNEL_LAYOUT_MASK(12, AV_CH_LAYOUT_7POINT1POINT4_BACK) +#define AV_CHANNEL_LAYOUT_7POINT2POINT3 AV_CHANNEL_LAYOUT_MASK(12, AV_CH_LAYOUT_7POINT2POINT3) #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 ba01e7ae3f..b84a645e05 100644 --- a/tests/ref/fate/channel_layout +++ b/tests/ref/fate/channel_layout @@ -31,6 +31,7 @@ cube FL+FR+BL+BR+TFL+TFR+TBL+TBR 5.1.4 FL+FR+FC+LFE+BL+BR+TFL+TFR+TBL+TBR 7.1.2 FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR 7.1.4 FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBL+TBR +7.2.3 FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBC+LFE2 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