From patchwork Fri Nov 3 16:30:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44500 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:181:818d:5e7f with SMTP id q28csp676260pzh; Fri, 3 Nov 2023 09:30:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IERm+SeAJfrKRoEx6jc2Mv9VC0JOqhNmeUlQwGAafiHN7nQfnb8u0s+hzWdrbOGBNACw4v3 X-Received: by 2002:aa7:c595:0:b0:541:783:4b17 with SMTP id g21-20020aa7c595000000b0054107834b17mr17603062edq.7.1699029048388; Fri, 03 Nov 2023 09:30:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699029048; cv=none; d=google.com; s=arc-20160816; b=mPQ5QIuVnl9D82roqXWKEjDYF3fl457JVv60cARGCFXOKNbGweDombdm/6sQtB1oTB NMuy9UMFd9dvIRk03ffFDhK+dkXZ9NiVhRQVQSVti9QSgv6u94nGFQFhG57yGgiT8DDl +HLLGfFyA5abpdn2AYtsSrhgAwwB7K9usxmFF0r26ALia2ubPpKZ2znn39y2IqvfPWz4 5Qy6XbtDemb6Xw1jnER9mLG62X2mg03EBUCHdKW+jJHwDNIgQVFf+ozEk9i2hhiJFEuc EqwmJVMkyDYN99VT3URd20txD/7T/M0cgdA6fbVFJpwgedX03Ode41Hd7D7rb4D1xj+X 0o4Q== 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=r/Q8wvrqxL1CtcfLGxuGUD4R68GMOJmXxzWsNKuTBKU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=kp2xYbFovsTI7uEEtINuOmZpQxigS3NOZqE8EUM82ZHD1bmPEo8i5M0UmVPHt3sPcC DOISNSEoLhxslCpfGDsm7l7/kZFRqoxHQrgMyZMOhE1UDFu3cwH4cBK9YPor0E8QqpF5 63c6QeE9I7BbWvbW2hrps8gwWkTA2NnsrJsgiQ0632HrMPKljo4zqzgEC6uvgCK2NN/e A3hZKF6P9cNQP5saWPcTTfR5vJdBuh243S09ZavtawiLYWfwmccsZgEjYPIRmzvJBFIl UdyXlklvTef4jxxLonKJanBjzHSuf3tRVSEhXu5fnDzEDugnonmynWcpWRoqo4ty6K23 xWxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=j7dTOUJo; 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 s19-20020a50d493000000b0053e2b911952si1122325edi.199.2023.11.03.09.30.47; Fri, 03 Nov 2023 09:30:48 -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=j7dTOUJo; 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 2B4BA68CD8E; Fri, 3 Nov 2023 18:30:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB3C968CD88 for ; Fri, 3 Nov 2023 18:30:30 +0200 (EET) Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-77896da2118so126354585a.1 for ; Fri, 03 Nov 2023 09:30:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699029029; x=1699633829; 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=5J+pZZewSBD1x1Z8qZbHOtIkkCc4iOKYJj79p7I0Czs=; b=j7dTOUJoGpsD8pNLvJ8f/l/wTS7NAiouiz8WfHRJhFCI1fg2H4MPfSMYhbkzpR175B zS65phVS88z4FqGoPHhTi+HOoYKI6o0W1fZj4Tl/A9rYZrXQyjmkaR2hRhQflZSKX90S pqVIF+I0QnFYLgnXtdrMDSb1jHKH8BCSkdhYlPyxk6gj+5AG5JC96NyhRNr/FONZnoZ5 OSeviyaxnKyoNelBb3SmlDKy0eEParWCkfMDI2UZGBeEIjfmJZA721xOUeMNL0WAz+5A FwoXyP9LqcGG54puz/C56Mwop7E1qqgMdg2W1IOKY0hZn0vphwOMdAMaRvYazSVAkctu lmwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699029029; x=1699633829; 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=5J+pZZewSBD1x1Z8qZbHOtIkkCc4iOKYJj79p7I0Czs=; b=BwHJk8DpQ0shIQJ3RhiOyI6DmwrmOaKQy9SrGXYIPzE9phWPfsHy6pxM5WLGHTdRrJ 09pSBgYGT93mh3GzAhJ629Upm2/My7mphXVxrqPtJCeTSv/FWINQe1LnuQ2BMWFhMrAb YAT7cds31eDGs36Eo8wwztO3avMl+m/bPiEAUhNpgV3B3qjZ1CU4oVe3SKgOqMNmcRBA wpY5FXIQr+r1tfkPgw+x8qmRq0jkOfDls1X2srS7XT38q2WMtt8opTGWXRB9nRpM+4dp 6/9ARJfwI4ahFqgmrp9yHo3Ta91zpMGdXI+D55oa99ZISMFkIz+iF1OZlpCQJhdx1lwc uNfQ== X-Gm-Message-State: AOJu0YzAP4lI26ntef2Q8KtZiWN5WdCKY+bO4yPmBtz9Lt+WQ2GAZyEN apJs3/nU0iXEVoX35OoYAuoSo8PDsnc= X-Received: by 2002:a05:620a:6016:b0:778:8dc1:bb7b with SMTP id dw22-20020a05620a601600b007788dc1bb7bmr23776152qkb.27.1699029028665; Fri, 03 Nov 2023 09:30:28 -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.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 09:30:27 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Nov 2023 13:30:20 -0300 Message-ID: <20231103163020.2113-2-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231103163020.2113-1-jamrial@gmail.com> References: <20231103163020.2113-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avutil/channel_layout: add a 9.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: Xcs+kfcWQQtN Mapping to ITU-R BS.2051-3 "Sound System G" and ITU-R BS.1196-8 "Channel Configuration 20". 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 0be20643de..a0b8d4b62d 100644 --- a/doc/utils.texi +++ b/doc/utils.texi @@ -729,6 +729,8 @@ FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR 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 9.1.4 +FL+FR+FC+LFE+BL+BR+FLC+FRC+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 acafdcc5e1..b59d798f29 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -208,6 +208,7 @@ static const struct channel_layout_name channel_layout_map[] = { { "7.1.2", AV_CHANNEL_LAYOUT_7POINT1POINT2 }, { "7.1.4", AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK }, { "7.2.3", AV_CHANNEL_LAYOUT_7POINT2POINT3 }, + { "9.1.4", AV_CHANNEL_LAYOUT_9POINT1POINT4_BACK }, { "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 052bf51c26..8dc1a91401 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -240,6 +240,7 @@ enum AVChannelOrder { #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_9POINT1POINT4_BACK (AV_CH_LAYOUT_7POINT1POINT4_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) #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) @@ -413,6 +414,7 @@ typedef struct AVChannelLayout { #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_9POINT1POINT4_BACK AV_CHANNEL_LAYOUT_MASK(14, AV_CH_LAYOUT_9POINT1POINT4_BACK) #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 b84a645e05..ab9bee947b 100644 --- a/tests/ref/fate/channel_layout +++ b/tests/ref/fate/channel_layout @@ -32,6 +32,7 @@ cube FL+FR+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 +9.1.4 FL+FR+FC+LFE+BL+BR+FLC+FRC+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