From patchwork Mon Oct 31 21:15:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39093 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp1159707pzj; Mon, 31 Oct 2022 14:16:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM649jm5E1FbqwOfeGlf8whmv08IV0U6CsIdmMULiR3wHDpipVNSJNA40l9MAV9Jp95IrdjY X-Received: by 2002:a17:907:7e95:b0:78d:e9cf:82c7 with SMTP id qb21-20020a1709077e9500b0078de9cf82c7mr15639115ejc.724.1667250986847; Mon, 31 Oct 2022 14:16:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667250986; cv=none; d=google.com; s=arc-20160816; b=Jm302EebsjMEyu/m7cdSLKZQ+RqeatB0zUhyOYzhITER/UHHhISsqsZexSCOEbtXR+ iBdIvs4nxxecrC8fzIgMWYrdrdvaijvly/GYsQq3FH49VWEmF5NtLIc63iTKqvTaO/Z3 RpIh61z+suKQvBekfLjlrRPhj2RUE+Xhip6C+EBVgZFr5X48GKzRV/1WaxMKd3U+8WwC S9DGt/9YlmcxQqsuqK2s6SwTiP/Mlub6ZG+Oat4IB3w3rmpLPCXgBn0gqilew+8VtQPP Jg+ZT9A2F0zWv8kCljolq1Xs7h4HpXSmVkS193kDLhxOof17x5S94gVxEstiVrJ+iX8X ftCg== 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=2cZ6UDXke6ew3DaKXw1ghYIN6Qbd+pD1dC+8Cq+d+H4=; b=O4jhguuiYwZYKDmkWj3eGk0b0Wh6kDVty0U6fiXP9PKfEfjwBeJjlF+vr5yb1RnVQK Mwq/zgirms4tzrWDfWs7/D7r30WvBCY1kWDOEGPd1YYwBLVYK+yVi51bJHinMl6MwpwR SPOyYEPIz6FlL0JOu4EUfVcyh0Xo8+1TMLJ0HiEFpYhGyM5b8IsMhhMsrQCCJvCPVmn2 81iNdH1toQXtLN2jv7e/SYidQ/5w4Xomb0BNbgNJ582BgoboFgBSKPRgsSx/Th9L5hqk 45Xnhyqea6sCBG4ziQnCKVO+KR2QEfuFXv/v4PjMKcNV/o8HJnrssaKgzN7Y8YrTgZdm Do6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=okVcF1ty; 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 oq19-20020a170906cc9300b0079ddb52369bsi6916625ejb.61.2022.10.31.14.16.26; Mon, 31 Oct 2022 14:16:26 -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=okVcF1ty; 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 96F7868BE30; Mon, 31 Oct 2022 23:16:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C6E168BDFF for ; Mon, 31 Oct 2022 23:16:09 +0200 (EET) Received: by mail-oi1-f179.google.com with SMTP id p127so14049367oih.9 for ; Mon, 31 Oct 2022 14:16:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=5EIKSDccAFk5pbMwIVtgU+75tpkU6DaDouU9GCF3z4Y=; b=okVcF1tyvTvZaAed13dlfWqZDJM5Z8fj74y0D5/f9td74huv6hoGb15qji4+ROFple 9Iy/ux7jFtF59wkdKjyPx6i4f7BOY5scNs9CyOPbAK8zHJ21XD/5V8/N2FghLWtBvJkw gJQ1u87/6B3ImD8+8Egdctq1fNWXATyfPYEMfkZwFFsTBa9rkVm+TwmFIh6k9oLOO3UQ 7HxX4viSsiBKhPEqpi2ggCq1jsBqf1L91v6QfDMOfQu30ussLFH8g5hSp5yxiGgQRbay PxbjJlhRq1B2aRxFP8kEhBo8HaYcNuzwaGoJd7h2gJh9yPpg1DgQG9CeX0r1fNP6iHQ3 aLBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=5EIKSDccAFk5pbMwIVtgU+75tpkU6DaDouU9GCF3z4Y=; b=WyY3gwlN/nF/HbAAsWmyjZBRVkachaCM+z/DlQR3w/VkOWchhsVotAp25NTps6qaMK pTs2Q2NkhbxWJ23pFbElEewYY5lcZ+O5cFxrsN0XsvAxt6jsMBZLKHSI72YYYAbaEzW8 kCcwQl1SFvewacDdiwQsbh8q4bNqLP1wVH77zbmHOO12nNPjmHgfSFXTR9nNcw2Ck7tJ gSHDLcaUlBikXiYCCGSmz69yj7AOkZ2bt+koSBaNMfaTN6AfidqZ/3rHMsYLtg2xgOcO MYJERwEGQEpC7F6EmzEQ8v6ZoxxuCSDUTy2XyVZXBXpX5/Lp5XCahYDNHJB/bNHns8p/ C5Xw== X-Gm-Message-State: ACrzQf3SkrRvD3WOkm3uIUL+VOIBtfDJJLhA0PDzYWfpPeBAvPDVOkXe yrK042GLD3OkluFiwsZrgR5CcnuD2tA= X-Received: by 2002:a05:6808:1247:b0:351:a271:2ada with SMTP id o7-20020a056808124700b00351a2712adamr15985837oiv.149.1667250967054; Mon, 31 Oct 2022 14:16:07 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id k44-20020a9d19af000000b0063696cbb6bdsm3147091otk.62.2022.10.31.14.16.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 14:16:06 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Oct 2022 18:15:50 -0300 Message-Id: <20221031211554.8176-2-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221031211554.8176-1-jamrial@gmail.com> References: <20221031211554.8176-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/6 v3] avutil/channel_layout: add a 7.1(top) 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: ksdaQSThAXRM 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 3c86f24285..58a970328b 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_7POINT1_TOP_BACK and AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK. + 2022-10-30 - xxxxxxxxxx - lavu 57.40.100 - channel_layout.h Add AV_CH_LAYOUT_CUBE and AV_CHANNEL_LAYOUT_CUBE. diff --git a/doc/utils.texi b/doc/utils.texi index 907a6b87cb..8e8bfa76d4 100644 --- a/doc/utils.texi +++ b/doc/utils.texi @@ -713,6 +713,8 @@ 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) +FL+FR+FC+LFE+BL+BR+TFL+TFR @item octagonal FL+FR+FC+BL+BR+BC+SL+SR @item cube diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index 5af7ea0e01..e2f7512254 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -196,6 +196,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 }, { "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 3e69163360..f345415c55 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -232,6 +232,7 @@ 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_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) @@ -389,6 +390,7 @@ 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_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) diff --git a/tests/ref/fate/channel_layout b/tests/ref/fate/channel_layout index 02eaad0929..b93f96dbb3 100644 --- a/tests/ref/fate/channel_layout +++ b/tests/ref/fate/channel_layout @@ -24,6 +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 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