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 5AABC47D0F for ; Wed, 18 Oct 2023 22:22:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7FB0768CA99; Thu, 19 Oct 2023 01:22:22 +0300 (EEST) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B33668C919 for ; Thu, 19 Oct 2023 01:22:16 +0300 (EEST) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1bdf4752c3cso47791875ad.2 for ; Wed, 18 Oct 2023 15:22:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697667734; x=1698272534; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=lZqa2dGdO4g8YAASK2boNUUNBJ9vxRJNu9O9JLtj/c4=; b=BOy7272TOwK0EqeOX7UfG2d1kew1KU+Nl5ZTZVDs+paZXU1NSOU8mZL4M3Y2f++7mL PyZrNZQPSUTc38hqcVfnolwTY0SbWOqHrAZ308b4sBn9HVi/h99hFNn0CDSK2L4gI3H+ i3jET/3qB4qcjM/xctJKYWk+53o76pzEIK8xfCBmOghyBWFkRepAwgUTmEb5f/ey63yZ frRi3KrD9FjP16GW7Al19MZPdH6JDz4XC+vjA3Jb2KRBWHu1hps87FvIFDe4Uu4oaQgQ yzPKw3f8vrP4+p1QlyAffW8ZZ/p0j3MlP7bmjgg5CAzMbbTDgHimFvLf62WcdYbTmkow DUyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697667734; x=1698272534; h=content-transfer-encoding:in-reply-to:autocrypt: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=lZqa2dGdO4g8YAASK2boNUUNBJ9vxRJNu9O9JLtj/c4=; b=Ejdaz20CpV9s7GsbySX34Yo6SQqst6ht2rbb3dP1a5A37bT1fbVJYqKi4QEbqrfSZY tKLcaasmdu/s7plDr3XFyieDfdLP7CuddOMcpD8joqRzqNfvOy5mUp6yK8/UwzoUCNm6 Qv4xEE0BWp38v8W94ZwvSrOcYdmuHK9NuKICX5fZHp2pgZVG7rbYxSxqkwvSuQSG9ctP zGOf5oadJlIoPlIsq/0vXafX8JGhisNZmP0mQe++43PwMvkdvCX0IHX5EMHHl7iBMLVu TIaXQRqNTHVARB1NkWYybSfA16XDXgRIAKjV9aayIzddp8UmYAkXQF1/iQG5xQ3luyW+ M+EQ== X-Gm-Message-State: AOJu0YxUbPXigWfOCk8LS3gvmCX1udziHmUwfv9GdXR1wQrrqyF5I/6u Akm2SNlP9sUFpsUVRwZHcTbYGRH7P/k= X-Google-Smtp-Source: AGHT+IGIZ3IF9sT3Xgh+oG+LUvdv5ctEJADFU2KGDpWW14w7kv6wOWkrNlgj013Xv7eeBHij/dKezw== X-Received: by 2002:a17:90b:d8b:b0:27d:1532:e736 with SMTP id bg11-20020a17090b0d8b00b0027d1532e736mr439730pjb.48.1697667733623; Wed, 18 Oct 2023 15:22:13 -0700 (PDT) Received: from [192.168.0.16] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id n12-20020a17090aab8c00b0027722832498sm377605pjq.52.2023.10.18.15.22.12 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Oct 2023 15:22:13 -0700 (PDT) Message-ID: Date: Wed, 18 Oct 2023 19:22:10 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: James Almer Autocrypt: addr=jamrial@gmail.com; keydata= xsBNBFjZtqABCADLW+vdEoZaJZDsIO6geYFTOcn1unsEHefj9zn+3oTHlDFFzO47mzHsSfbK 9JE2xpOJEVnC8FAF5Sayi/pVwV+mtQUV3n5dgVeVBYF9GUQwOGFCpK8X54RRqhkgknbunOEE 0CtgAJgmpFmmmHgq02GvEspx1h/rh4apqwQR6QX4Favb+x9+i9ytVpwVcBX94vo2toyP7h/K BWfadQmb8ltgE1kshfg+SQs/H5bTV5Z1DuEASf02ZL/1qYB/sdTgWPLv9XMUHHsRFmMY8TMx wJSkP+Af3AiYQPJYz1B1D4tt98T/NoiVdin10zATakPjV8hXaobuRmxgakkUASXudydDABEB AAHNH0phbWVzIEFsbWVyIDxqYW1yaWFsQGdtYWlsLmNvbT7CwJIEEwEIADwCGwMGCwkIBwMC BhUIAgkKCwQWAgMBAh4BAheAFiEEd1EujP2UoWlX5pp6FGMBrXN2WeAFAmJoLUUCGQEACgkQ FGMBrXN2WeAFVQf9GtGhniRs1PzNUOgJktCnv6j4BbLieaIPYPEFXKDHOgjqQE2zVMYXnoXl Jam928ii902a8OY06r9ywn/R8ApD1/3NY/v64O71CY9scz5XyH2au8wIZ6HwFy3/f7sqjdGD uctY8Qs7rjT7NkoC5lmgMu2v2k03dGtM9AAf5AK5gU+H0EUw7vmKKiXzUqt5kvBuf4CEwXvH AQT1SMJ52rIlDWB7FQFyZeUbOAK2IgY/KNedfK6nsgd/eQVnlofPd2XoddE7kP6iys7jJefw DD3g3rZyDTq7in5dyk5glaNpWZpbHGBs+9SCYLnfQ8XvWqPFOD+gj0plamKANgOvavKTxM7A TQRY2bagAQgA69YtILj8kYxmqPr/M8+MXT7wVoOWVW9lvSmPquCELaDy/NIS7D06VC5EuE/6 JlJXZMTn37NLlyWhzwOgXuXw5w2tyoQQBuvqGiXJijuXwXH7HKdzrc6rpYtAqt5w05hzNrFS KrS0izG64VpWrfproy3BsL+8TBm9brLhhNPynVRqVukbbGzlATTzNQGZ14TTi2/dL6DkMQnM qn4jX9UEe4GdGQBP50bUJSSmeiIkyNLWA+znuN2PZEz930ZwNrF9GtDVw7mzcmpCZ7spldE2 tutbpy9D1bIqxyqBrYDSezyzL2adR1qgHyOTMCHg2AYNkrIQHrSyJxKTpZ1/hqOp8wARAQAB wsBfBBgBAgAJBQJY2bagAhsMAAoJEBRjAa1zdlnghekH/0Yb0iYJ74oID2f/Fj+AJKS2ekQF P2xOr8lpGzgp/+yWUvPtqbX0A33anBJdYwxaAC0NataX3tfZ+oJkzXqfmqhIHMPYHdZesJA2 Bk9hU/33mDl5s5U66/z0uelWzwKVHoQ2O6or4+qF3HJFSJLCe9uvWJ3zXf9F342Ftj73sfx+ 3xkw/IXsN1RqbYqDlzpoEQ99SIEfY/8Jjwnd3sIPfqkuyeaYfe6GJDqKawdCEP1oRRlbXEAp TJgYz8r3nPhGv9cdHNDCk44ISbsqVuxIEnLqi4fTPZaGupiQhT+srl268TTAp2TQW7+6Ce/b NPQorMquzS/LZoyALpmsYi/miMc= In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH] Add a 7.1.4 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/18/2023 4:19 PM, Will Wolcott via ffmpeg-devel wrote: > Signed-off-by: Will Wolcott > --- > doc/utils.texi | 2 ++ > libavutil/channel_layout.c | 1 + > libavutil/channel_layout.h | 2 ++ > libavutil/version.h | 2 +- > tests/ref/fate/channel_layout | 1 + > 5 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/doc/utils.texi b/doc/utils.texi > index 8e8bfa76d4..c67ae6f6c6 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 7.1(top) > FL+FR+FC+LFE+BL+BR+TFL+TFR > +@item 7.1.4 > +FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBL+TBR > @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 9b581ae6b3..a2c4eff5f4 100644 > --- a/libavutil/channel_layout.c > +++ b/libavutil/channel_layout.c > @@ -201,6 +201,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 }, > { "7.1(top)", AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK }, > + { "7.1.4", AV_CHANNEL_LAYOUT_7POINT1POINT4 }, Fyi, your client mangled the patch. It can't be applied as is. This is introducing a new naming scheme, I assume to represent "Loudspeaker configuration for Sound System J" from ITU-R BS.2051-3, right? Until now we have used the definition in ITU-R BS.1196-8 for other layouts like 7.1(top) and 22.2, so it would be a good idea to try and come up with a common ground about how to name things from now on (Changes to existing layouts are possible, if anything by using alias defines). > { "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 ac2ddfa022..ddeff8c644 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_7POINT1_TOP_BACK > (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT) > +#define AV_CH_LAYOUT_7POINT1POINT4 > (AV_CH_LAYOUT_7POINT1|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_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) > @@ -399,6 +400,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_7POINT1_TOP_BACK AV_CHANNEL_LAYOUT_MASK(8, > AV_CH_LAYOUT_7POINT1_TOP_BACK) > +#define AV_CHANNEL_LAYOUT_7POINT1POINT4 AV_CHANNEL_LAYOUT_MASK(12, > AV_CH_LAYOUT_7POINT1POINT4) > #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/libavutil/version.h b/libavutil/version.h > index 4c0c545d40..279e54c394 100644 > --- a/libavutil/version.h > +++ b/libavutil/version.h > @@ -79,7 +79,7 @@ > */ > > #define LIBAVUTIL_VERSION_MAJOR 58 > -#define LIBAVUTIL_VERSION_MINOR 27 > +#define LIBAVUTIL_VERSION_MINOR 28 > #define LIBAVUTIL_VERSION_MICRO 100 > > #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ > diff --git a/tests/ref/fate/channel_layout b/tests/ref/fate/channel_layout > index b93f96dbb3..d49f8906d0 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 > 7.1(top) FL+FR+FC+LFE+BL+BR+TFL+TFR > +7.1.4 FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBL+TBR > 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 _______________________________________________ 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".