From patchwork Sun Oct 30 16:14:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39051 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp453174pzj; Sun, 30 Oct 2022 09:14:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4QO1/UW2f1UOy3ozQpjLkRezQXOux8HsRMcOVH2w0WOwXgORjHMURqDgftDgcWJ/3RZehy X-Received: by 2002:aa7:d80a:0:b0:462:2c1c:8716 with SMTP id v10-20020aa7d80a000000b004622c1c8716mr9606423edq.185.1667146485540; Sun, 30 Oct 2022 09:14:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667146485; cv=none; d=google.com; s=arc-20160816; b=yWduXGT5wiQsDQG5UO9G7w4V5zDreqs/c0I8hyQ94ByPaT+OD59l+VrrxGsHKBxu74 DHnRPMxPY2WInigiR2IL5n3jZ+Bk/yZpr6wS1gQHC6K4Tb5AQ9P3nyGOJImxa9rJ7S6H 7HaScCwU1CqjNoIIaYG9TPYFN4yL/r+bb8r1W+9LVmP4jm98JTWuudbrcT9hNiH6SPei VpTrz4XccHDJgKD7tkWOcsgoGvMOwF8SNLuFUKlilsdESwYbVqrBq/mKKEuU3rM+CdgC 0VtdeQXJKbrp8UgbloAB4nu/W8GfYr1O/z5DL7rm1i4/adbtHv8nczTOr+Y/AxCYDOeM z83w== 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=zoo10QAiKBCxNZR4XQAFdCSq2rf0nrhFCLcBAtoQ8Pk=; b=PkLovVnXSSgTgpa/F5werXM6sALG42Io7P6hQWwL8qo0K3Az3oRjY9OAyt8oqv6hgc FZ6yQE9Q6iVOLIhC3607VfD/HE7pK/cOK4JxD8CvzMjQJQJypMDiKmYCSM7N4JcZrt7p ufUrn5WjZJcKi6TMpUtMu00asDWSUYtrydwbpRnAuLEH/bWgEdjR0jaDd3FcOCcXogFD QKK2bIkheXddCI9GYd1zNsCJbDHvr1sHUshmOWNs9/nZZvP8yL81Fqhb7as3f41+Ejqz ASLplK9tes9ESQhJ55+qBjZ3svLID3BhzlibcwC3SqDIx8z3VBF3FMeKvYdj/Vm/qqGm 96iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=np0QP0Cp; 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 a6-20020a1709063a4600b0077b83f3dc20si4535449ejf.63.2022.10.30.09.14.44; Sun, 30 Oct 2022 09:14:45 -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=20210112 header.b=np0QP0Cp; 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 1D2AB68BD33; Sun, 30 Oct 2022 18:14:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4602B68BCE1 for ; Sun, 30 Oct 2022 18:14:35 +0200 (EET) Received: by mail-ot1-f53.google.com with SMTP id r13-20020a056830418d00b0065601df69c0so5620495otu.7 for ; Sun, 30 Oct 2022 09:14:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=wxSsz13ZgrpmqIUp11mEe+ga+SHAW2c8WpwwiXVyP5U=; b=np0QP0Cp8AMEjVDfK7zoMwGx1m4DC9rjMQdupZee0MYEeV0chZ/qOOnBhUafn7r4Xw 3A8XbJnUCZTTKKxB3wvwRI4w8phTR4YZexgfHhOWtRmq0OLoy4+Kvq5pILfSPrqzaMw5 JemAYUnic/QJukFHtcBCbsdhBntHdijU43ynaEcKzLaFnAFNkBMj/bYLV6MpDxJA1nLK g4wijlcGh095Zj3YTKJCTO88REEXDC74Yu0wki6i6/qqvIbT+CjlY+RUj4cpbvJaOk3c J4O6L8SFEIExDfu3JeauCPjTQo7y6qlCgbnu0i3bKusAkZNnRABSTVZq54S7w1VnaDIf /qRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=wxSsz13ZgrpmqIUp11mEe+ga+SHAW2c8WpwwiXVyP5U=; b=pA4kNEuoAMG7E2aIZyEGpSHVI7B16FLVy9Z0a6PMNQs2SluKSXntP0HBTwF9u0Sbbl KRdUeGmB3lEpC1A4TWJxjbRVenDD6BZQMEVgvUCqawIC8EtGcm/Ldc8D6EzXkyGV2s+A O6r6n8ndGPlDaLhxYa0jP+nzigMs8X3Nrdl8WXnQ0pR10+1VlS+uEYH6SG10216PMDUD RFZnOxbpeFSPJFrxYoYsi4xGPzGrX4JGNdKW/u5G8RKpumWQxcgyP9+dTWy0lk8nWzOa 5VBpCuu3NYCBoLmyJpH2JgW70P5LjBePeP6Dhhj+llv3suhiIESNr107+Z8jirRqptVl aAZA== X-Gm-Message-State: ACrzQf2uNuC6QbT37ZA+oS5nvJhXwAfF3oJcIlN/VeElklBc2bRxe5O/ YoG4WMSd2eK/Zq458IAKIVLU8wGFbn8= X-Received: by 2002:a9d:76ce:0:b0:661:c8c7:6d40 with SMTP id p14-20020a9d76ce000000b00661c8c76d40mr4358552otl.259.1667146473223; Sun, 30 Oct 2022 09:14:33 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id v9-20020a9d5a09000000b00661b46cc26bsm1833433oth.9.2022.10.30.09.14.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 09:14:32 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Oct 2022 13:14:12 -0300 Message-Id: <20221030161412.1293-1-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/channel_layout: add a cube 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: 1+TgilRAVjx3 Signed-off-by: James Almer --- doc/APIchanges | 3 +++ doc/utils.texi | 2 ++ libavutil/channel_layout.c | 1 + libavutil/channel_layout.h | 2 ++ tests/ref/fate/channel_layout | 1 + 5 files changed, 9 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index 5807bf8069..5aca1d1b5f 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-10-xx - xxxxxxxxxx - lavu 57.xx.xxx - channel_layout.h + Add AV_CH_LAYOUT_CUBE and AV_CHANNEL_LAYOUT_CUBE. + 2022-10-11 - xxxxxxxxxx - lavu 57.39.101 - pixfmt.h Add AV_PIX_FMT_RGBF32 and AV_PIX_FMT_RGBAF32. diff --git a/doc/utils.texi b/doc/utils.texi index 627b55d154..907a6b87cb 100644 --- a/doc/utils.texi +++ b/doc/utils.texi @@ -715,6 +715,8 @@ FL+FR+FC+LFE+BL+BR+FLC+FRC FL+FR+FC+LFE+FLC+FRC+SL+SR @item octagonal FL+FR+FC+BL+BR+BC+SL+SR +@item cube +FL+FR+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 21b70173b7..5af7ea0e01 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -197,6 +197,7 @@ static const struct channel_layout_name channel_layout_map[] = { { "7.1(wide)", AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK }, { "7.1(wide-side)", AV_CHANNEL_LAYOUT_7POINT1_WIDE }, { "octagonal", AV_CHANNEL_LAYOUT_OCTAGONAL }, + { "cube", AV_CHANNEL_LAYOUT_CUBE }, { "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 059ff70841..3e69163360 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -233,6 +233,7 @@ enum AVChannelOrder { #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_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) @@ -389,6 +390,7 @@ typedef struct AVChannelLayout { #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_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) diff --git a/tests/ref/fate/channel_layout b/tests/ref/fate/channel_layout index 19bcbce7d8..02eaad0929 100644 --- a/tests/ref/fate/channel_layout +++ b/tests/ref/fate/channel_layout @@ -25,6 +25,7 @@ hexagonal FL+FR+FC+BL+BR+BC 7.1(wide) FL+FR+FC+LFE+BL+BR+FLC+FRC 7.1(wide-side) FL+FR+FC+LFE+FLC+FRC+SL+SR 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 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