From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id EE0A144192 for ; Sun, 30 Oct 2022 16:22:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7BDA268BD3C; Sun, 30 Oct 2022 18:22:25 +0200 (EET) Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com [209.85.210.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F3E768BC82 for ; Sun, 30 Oct 2022 18:22:18 +0200 (EET) Received: by mail-ot1-f41.google.com with SMTP id 46-20020a9d0631000000b00666823da25fso5658880otn.0 for ; Sun, 30 Oct 2022 09:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=haPuMHzvnyWSXcyKVhLju2u7HC0XoKDrtpWItCgQiKA=; b=Hf7UwWnK2K4HrVSmTrP7/KRZ3+pj3DqX0lXw93jLoser2WS18GqrF6KeT1BIJlt1B1 hU6Cgcij0LsoIDIc3epCJW0CSdmJCmxqHIjpp5VDyvG9Ug8a7DpRKHOgSnjnmGGsFsdO pRjIaU433ZxgKWlbwjyhZnxcO/2SpKV9and3miTYy3NCl6krCUaWQZjSJPPuBpAH/r0n fpBHwxuaIeEzKE9XtiebVy4jw4360YlRemXg2x/B1vfvP5u6fAcxTmtEaKB18zy0RSS5 ZVoIz1CswHAqgPCSPBU8qR5y4XBlifyBHFyeMGjlaw4a8fVeDuPsnQ1h9Z2qi0U7S6lZ FZWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=haPuMHzvnyWSXcyKVhLju2u7HC0XoKDrtpWItCgQiKA=; b=eC+9vwbt0t7fCOCDFfnEqDLFfJYk1ajT/97ind0/xCJ1scvGwBi+RBwCE8x3Pi79EJ iMBnXtCZKH1LQWDnbxgd24UJ7jpCMt4vitpN8quWqMIIqRkfhswieUT1vbDNEIf/ctWJ QyVZdgn3ncu7xK50fWeLYSt26rkHhrJToKlmiFVKwL/sYQpOUL/SqlI1apDyni0qvaIP YVrkHEOLyfQQDvU6RY6My+oTnsRhPPuGLogcr7KAt5nZmvt1SGWUsaxu5eA5gkiUM6gk 6DjSnxeDexHKx8EvYdLwGeVjfJzZOm4Bq64V3G5uRQKHy7FBfZ3CIjH0Uz4nZqUYAvVp kPLQ== X-Gm-Message-State: ACrzQf1cJh/m2Z4aw6saZ2R6vgfnnrW1ZFHK2IzCd0aI9qwLwqC1YJwj cmVb3koqis2sfXUJyPZun6umRmrbx+8= X-Google-Smtp-Source: AMsMyM5nUs4ml53VRACLBMdj8xiKNSc3+iIYnV3YVgXIeMRdW8Ov5a8UkBi6uMzuECO/FwOs1r+tuw== X-Received: by 2002:a05:6830:4114:b0:661:a008:3777 with SMTP id w20-20020a056830411400b00661a0083777mr4671665ott.200.1667146937023; Sun, 30 Oct 2022 09:22:17 -0700 (PDT) Received: from [192.168.0.13] ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id k29-20020a056870959d00b0012c52bd4369sm1981576oao.19.2022.10.30.09.22.00 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 30 Oct 2022 09:22:06 -0700 (PDT) Message-ID: <4bf7faf7-7fd8-7b50-8bfc-a6af243bd681@gmail.com> Date: Sun, 30 Oct 2022 13:21:59 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20221030161412.1293-1-jamrial@gmail.com> From: James Almer In-Reply-To: Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 10/30/2022 1:19 PM, Andreas Rheinhardt wrote: > James Almer: >> 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 > > Is this a common name or is this something you made up? It's the same as kAudioChannelLayoutTag_Cube from AudioChannelLayoutTag as defined by Apple and used in mov (see MOV_CH_LAYOUT_CUBE in lavf mov_chan.c). > > - Andreas > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".