From patchwork Fri Oct 28 12:21:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39028 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp754498pzd; Fri, 28 Oct 2022 05:23:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM74bjcxC0ywmqHycqpWZm/U9rwt/lw15F9/gppKQRUpcd/+Bi8N21aHooe66bLFtLA5L3kG X-Received: by 2002:a17:906:9bd5:b0:7ad:939d:79a9 with SMTP id de21-20020a1709069bd500b007ad939d79a9mr6187230ejc.479.1666959781712; Fri, 28 Oct 2022 05:23:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666959781; cv=none; d=google.com; s=arc-20160816; b=inA43uZnB4utevqukBkhsOYps5+SsTKQJds0CBkAQPoqPqhqzw8Ce3N8sBPjpcB7QQ g3B7hIk9rx9NHdGChxZ6AAaNcCGVHgwogW8mWybFqfInBrATfS9qA33q5z8jANPLtQTK mXpWNa3ucOHB3Kt1j//shKPp3wGTLfTM/X6RpAHwnsBvG5UPy5d3cuHNljE3lZSHB4gO vCljcJjfKWn5rrD/hk8x6vKZtuGHM2Cwtg3NfzXQ+6h0L9gldF0rbi7syxQgzVk3ASk9 8cDGI1lZVVlrwRQ/OWjSx1HvayFEJri83D0//HFhWXZtGdArNzi6ga7pgB2zRnJ38hIS tW1g== 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=eUlvNXDbNYYrFlYsyB1eH26dZ/7Vv/CVD1AEm0viikw=; b=mu/6vaNWYb97492IGZnh6iYJ14EJW0bbl1mYDglJj3TPVZa//7I6e0MkTdA+VhATjc JCEu9JMVqOh4gdU7cnFig5aVISJZy3aSEe2nZBAcglxnNnOmrQrFnnlEGiCPpndFdcRt dfCdrJGgX+/kfm/3YKe/cB1GbFw7cB06OH1hnqVofFJaNTZdzv5UeoHLDq1rz9L1ijj8 6YGfUENqnjwdxZFTuh73hBOChyR3TG7ilvFXxPLl9JJBdhjpemwV/Z9G/rTza+oSzWm8 TkG4XUtr5NARE+DhEJSZyTsY5bgTin3uAYhWQtMH2XWPESdNhuY7rgG2/BAe/jpGw1Vk 5wxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=kpV3XoSq; 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 r17-20020a05640251d100b0045c31d9643bsi2136658edd.2.2022.10.28.05.23.00; Fri, 28 Oct 2022 05:23:01 -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=kpV3XoSq; 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 29C7768BCE3; Fri, 28 Oct 2022 15:22:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD56A68BB0D for ; Fri, 28 Oct 2022 15:22:42 +0300 (EEST) Received: by mail-oi1-f177.google.com with SMTP id l5so5952686oif.7 for ; Fri, 28 Oct 2022 05:22:42 -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=T8lolWovMvpOpSGDtXHYGpZj2xXx8muyNWBPynbhMmk=; b=kpV3XoSqCBz96Sw/agF54H+B2fTOIRCGX+iYaM3P+2hENMsjx+oATvtMVpjavnNfAm jgSeAAg7jCPU1P2PSpS9VNk+a6aL3U7vuccRak18xwVsQg3m04ssX3e5NkVHvkRClidM o9eLNFid7H3bIQ7e1KNIyv88UaZ5hUALrxbZk6CJW+CndQTqzzOIteS+9sBjrabzuVGh OqYVZQm54awdWdMvb5Yesx6DocwPDqhvEdqkNkdVAjvXLl/th9GrPSywe3x/H07N+En7 7uPtbKP1Sc5+spJN3a1t4lwme8MIIvh3Yv4zABsKFCR4y65gCruRfLENvHUE0M4cL7Fb xcQg== 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=T8lolWovMvpOpSGDtXHYGpZj2xXx8muyNWBPynbhMmk=; b=A3zZNVeO0U/pV/FUHd8iUeoElrPrgAZrIVsEZpkgKk0F2fEVRX2XTt15HJDXuQFA6t PvdWdihruzBaUws3E36WNI4rJbn3cuUbRwdz3flfjxcQ/FwgOEkwANVfqftEsNNx5QXF WbM8NJLqrqAw1mVtmIbMtXe/RUyQq5/bDgDUk14Ag+IwJ5Q/AbR6DMSGdgOYKk9xwvaJ V/4WHOj9ejghCW2M23yZWo5MwImAmN6+CigPxQf4ZKiML8HKCmXeWpSVUx3LWJ37UZxg /a9hvF4blZ7S0/kFgqkUmQjrR+Jh27q5pWTeJGlJ39E8lvM1aJ90hVLtNRj7guvf4aEY qbEQ== X-Gm-Message-State: ACrzQf1iSeBOBy/qj1kdG+Bj0jECAzPiVvuyK7ZiHlvZ1tOmFmcH5Tsl wulX6NUf9x2nm/7PUPKv3H/AQ2jcTwA= X-Received: by 2002:a05:6808:1307:b0:355:4deb:e375 with SMTP id y7-20020a056808130700b003554debe375mr7858109oiv.264.1666959760944; Fri, 28 Oct 2022 05:22:40 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id v206-20020acaacd7000000b0035028730c90sm1458869oie.1.2022.10.28.05.22.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 05:22:40 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Oct 2022 09:21:38 -0300 Message-Id: <20221028122140.1885-2-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221028122140.1885-1-jamrial@gmail.com> References: <20221028122140.1885-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4 v2] 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: qyqWrd76dYMI 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..75bbcaddff 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 and AV_CHANNEL_LAYOUT_7POINT1_TOP. + 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..d19523a5f4 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+SL+SR+TFL+TFR @item octagonal FL+FR+FC+BL+BR+BC+SL+SR @item hexadecagonal diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index 21b70173b7..bc0016d346 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 }, { "octagonal", AV_CHANNEL_LAYOUT_OCTAGONAL }, { "hexadecagonal", AV_CHANNEL_LAYOUT_HEXADECAGONAL }, { "downmix", AV_CHANNEL_LAYOUT_STEREO_DOWNMIX, }, diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h index 059ff70841..9246562807 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 (AV_CH_LAYOUT_5POINT1|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_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) @@ -388,6 +389,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 AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_7POINT1_TOP) #define AV_CHANNEL_LAYOUT_OCTAGONAL AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_OCTAGONAL) #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) diff --git a/tests/ref/fate/channel_layout b/tests/ref/fate/channel_layout index 19bcbce7d8..918b01584d 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+SL+SR+TFL+TFR octagonal FL+FR+FC+BL+BR+BC+SL+SR hexadecagonal FL+FR+FC+BL+BR+BC+SL+SR+TFL+TFC+TFR+TBL+TBC+TBR+WL+WR downmix DL+DR