From patchwork Thu Oct 27 18:26:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39019 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp337378pzd; Thu, 27 Oct 2022 11:27:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7gFOUZJ351ajNoKEga0r2Ty31ZRnjOldHiYfryhV4IBUKZiNFGoC3PXjdeqAmD2RgZfBfU X-Received: by 2002:a05:6402:4441:b0:454:8a74:5459 with SMTP id o1-20020a056402444100b004548a745459mr45892607edb.155.1666895231481; Thu, 27 Oct 2022 11:27:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666895231; cv=none; d=google.com; s=arc-20160816; b=Ip7X+bzEvZ54gXZ0WqziFMi9C6uyH5YOFKTMcSZjPfsQ0Xh6W8bEfp5H2EuD0icdXf Z6siN9gvjklhchgRVZy8p+eL+xUvaCiCxShO0563VQotf50uf/TGIqXGnDhFR8h0Hww6 NVdPOux6MS3ljYT5A7T3inV7b4vDJ79ZxEix9pSYan2rlbfijayLK+2dpJn92MDiRq4K 9Z+jXaxToDWMORbejZw/9juBNqFv1OSHQcxFQFR/3oNuvxrrRHNnmgMUB/9zt/2G7t0w X3EVlLGV5EDLclzAF0YAKylySjkVUvUenA6fvJEA+8C+Ouod70VjuMeSdLXIBDZbnvfk aUWw== 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=8VF6+A0nEzuXyyHll+CbZa9ZT5OszOjrF/X7/K2TlMM=; b=utaIZh5CIFeloxRljNxPbjZ6awNqCPbp3q5sm7O/MO2zUzPoRb3ncC8sHYukDaZzXX woNTSGKae0XaBpVgGuJAp1vYW3lHe1XEodJyJdnUhqWrBeyuZWkUOXQVxdDWGeL1d0C+ Lx+4/zt0ZJdZ5pfTQqNCICioOlJvwpOHVDgO4Vo8q4+yFHWTP7dKueGSJYVU1DN/F3V3 eHX55i2ol5UTxB59Y74XHQk4NCXU9eXoL9tKssAp3S5etvzgn6Zo+eS/koCAcq8ku8vk SQSeIeajLsUhETi+lQFrAVw3pfUp7GEtvNUfJ8kEOBk2WpzimUP4JhOQv/395hyQK6SF pYfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qFwtealn; 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 k18-20020a17090632d200b00791a7e441a3si1867805ejk.459.2022.10.27.11.27.11; Thu, 27 Oct 2022 11:27:11 -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=qFwtealn; 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 2097268BC42; Thu, 27 Oct 2022 21:27:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BAA2468BC3B for ; Thu, 27 Oct 2022 21:26:54 +0300 (EEST) Received: by mail-ot1-f48.google.com with SMTP id cy15-20020a056830698f00b0065c530585afso1552340otb.2 for ; Thu, 27 Oct 2022 11:26:54 -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=K/50/wkHlJd0XAdbtDOU++x3IxL2arIRWV7SrEaG788=; b=qFwtealnQ/Ze1BdJBcW1i+oE1ET8qp0A8hvJK/EZ0bErY/OTwfBrt9WMuonAopa+nX X+koYsnEUYFC34K2EcXytITiqBMzJ3FfpK9IfC8qK4AvNBggiHgCnQtI5zcuPJpPSHce zuk6Dh5IEmdFVOwfHAAaRDiAToUJxb5Q/DNn2uKPx0+xkAb/PGs38+bafcaHqcYgrsf+ 3cU80fH23UAikHIP7j9MCPjg05aBI/00ZDakIoswfWeVTBRHY3hCADjdRfpKXkJoMPS1 O+4amIW1ManyAWgAPK6j3HGqaQqSCdvBBfLvfuYTZHmGBIY0NgKBiHyLo7aYETdUSXRb cYsQ== 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=K/50/wkHlJd0XAdbtDOU++x3IxL2arIRWV7SrEaG788=; b=aWFiJ+4GwA7YjSk9dSLq5waGPQvryIVw4j7svNvJbRj+QqZPw6V8VMo9LYLiVrC7L+ ZfCxE+X356hHFGAXKWKMeufQN8TsgkNNxwbBkiXEUqyh5v+xXMyzIEH14a8ytXmSkcL2 pAuZwV4d2dYwpbAWJLuFpDdZgYwkR65MtzSqCvgbO9ioztmKYJ9KfY/wS5+Cuv5FmxaA ezSRYvxHlflyya9wCWOq0f+B6C2zQ5uAhcmgLRBlBWHzaGqEiZ1FEyDYSnQ5zxnVLIAX NqzRj1OSqXYMqCsV7kw1kukqLSEX0X1V3V7luprnY9nnl0nyL+36URnvg8F22uZD7ChW DH9w== X-Gm-Message-State: ACrzQf2ACnKu4izb9hpT4KXrnKoAZVdzZwcjVTgVOVtutS2hkaOXea1y XUBcR+VL38OGH62BTkiQiUpGa8Hm8yc= X-Received: by 2002:a9d:610f:0:b0:661:8e2b:19d3 with SMTP id i15-20020a9d610f000000b006618e2b19d3mr25135458otj.66.1666895212496; Thu, 27 Oct 2022 11:26:52 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id j126-20020aca3c84000000b0035770fc6ca9sm696008oia.16.2022.10.27.11.26.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:26:51 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Oct 2022 15:26:51 -0300 Message-Id: <20221027182652.46178-2-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221027182652.46178-1-jamrial@gmail.com> References: <20221027182652.46178-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] 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: lFcA4d4imS5P 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..009452c71d 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 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..0acbdbb9eb 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_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_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..4919e23ac4 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 hexadecagonal FL+FR+FC+BL+BR+BC+SL+SR+TFL+TFC+TFR+TBL+TBC+TBR+WL+WR downmix DL+DR