[FFmpeg-devel] [PATCH 1/3] avutil/channel_layout: rename 7.1(top) channel layout to 5.1.2

[Anton Khirnov]

Quoting James Almer (2023-10-24 01:23:44)
> This layout maps to ITU-R BS.2051-3 "Sound System C" and ITU-R BS.1196-8 "Channel
> Configuration 14", and it being the first layout with top layer channels, it's
> best to use a different scheme to properly convey the presence and amount of said
> channels.
> The new name will also be a better fit for the additions in the following commits.
> 
> Signed-off-by: James Almer <jamrial at gmail.com>
> ---
>  doc/utils.texi                | 2 +-
>  libavutil/channel_layout.c    | 2 +-
>  libavutil/channel_layout.h    | 8 ++++++--
>  tests/ref/fate/channel_layout | 2 +-
>  4 files changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/doc/utils.texi b/doc/utils.texi
> index 8e8bfa76d4..1388e5dabe 100644
> --- a/doc/utils.texi
> +++ b/doc/utils.texi
> @@ -713,7 +713,7 @@ 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
> - at item 7.1(top)
> + at item 5.1.2
>  FL+FR+FC+LFE+BL+BR+TFL+TFR
>  @item octagonal
>  FL+FR+FC+BL+BR+BC+SL+SR
> diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
> index 9b581ae6b3..b259e75d37 100644
> --- a/libavutil/channel_layout.c
> +++ b/libavutil/channel_layout.c
> @@ -200,7 +200,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    },

Doesn't this need deprecation?

-- 
Anton Khirnov