From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 4/5] avutil/channel_layout: add av_channel_layout_retype()
Date: Fri, 2 Feb 2024 09:56:31 -0300
Message-ID: <3677f954-85ec-4098-a6da-5f3c5dd40873@gmail.com> (raw)
In-Reply-To: <20240129232755.9622-4-cus@passwd.hu>
On 1/29/2024 8:27 PM, Marton Balint wrote:
> Signed-off-by: Marton Balint <cus@passwd.hu>
> ---
> doc/APIchanges | 3 +++
> libavutil/channel_layout.c | 48 ++++++++++++++++++++++++++++++++++++++
> libavutil/channel_layout.h | 11 +++++++++
> libavutil/version.h | 2 +-
> 4 files changed, 63 insertions(+), 1 deletion(-)
>
> diff --git a/doc/APIchanges b/doc/APIchanges
> index 8e8498f803..ce1e816fa5 100644
> --- a/doc/APIchanges
> +++ b/doc/APIchanges
> @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09
>
> API changes, most recent first:
>
> +2024-02-xx - xxxxxxxxxx - lavu 58.38.100 - channel_layout.h
> + Add av_channel_layout_retype().
> +
> 2024-02-xx - xxxxxxxxxx - lavu 58.37.100 - channel_layout.h
> Add av_channel_layout_from_custom().
>
> diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
> index 0810d32bf6..cc8c208080 100644
> --- a/libavutil/channel_layout.c
> +++ b/libavutil/channel_layout.c
> @@ -1036,3 +1036,51 @@ uint64_t av_channel_layout_subset(const AVChannelLayout *channel_layout,
>
> return ret;
> }
> +
> +int av_channel_layout_retype(AVChannelLayout *channel_layout, enum AVChannelOrder order)
> +{
> + if (!av_channel_layout_check(channel_layout))
> + return AVERROR(EINVAL);
> +
> + if (channel_layout->order == order)
> + return 0;
> +
> + switch (order) {
> + case AV_CHANNEL_ORDER_UNSPEC: {
> + int nb_channels = channel_layout->nb_channels;
> + av_channel_layout_uninit(channel_layout);
> + channel_layout->order = AV_CHANNEL_ORDER_UNSPEC;
> + channel_layout->nb_channels = nb_channels;
> + return 0;
> + }
> + case AV_CHANNEL_ORDER_CUSTOM: {
> + AVChannelLayout custom = { 0 };
> + int ret = av_channel_layout_from_custom(&custom, channel_layout->nb_channels);
> + if (ret < 0)
> + return ret;
> + if (channel_layout->order != AV_CHANNEL_ORDER_UNSPEC)
> + for (int i = 0; i < channel_layout->nb_channels; i++)
> + custom.u.map[i].id = av_channel_layout_channel_from_index(channel_layout, i);
> + av_channel_layout_uninit(channel_layout);
> + *channel_layout = custom;
> + return 0;
> + }
> + case AV_CHANNEL_ORDER_NATIVE:
> + if (channel_layout->order == AV_CHANNEL_ORDER_CUSTOM) {
> + uint64_t mask = 0;
> + for (int i = 0; i < channel_layout->nb_channels; i++) {
> + enum AVChannel ch = channel_layout->u.map[i].id;
> + if (ch >= 0 && ch < 63 && mask < (1ULL << ch))
> + mask |= (1ULL << ch);
> + else
> + return 1;
> + }
> + av_channel_layout_uninit(channel_layout);
> + return av_channel_layout_from_mask(channel_layout, mask);
> + } else {
> + return 1;
> + }
> + default:
> + return 1;
> + }
> +}
I wrote a function like this some time ago, but i lost the patch by
accident during a migration.
The way i approached it was making the return codes reflect if the
conversion was lossless or not, as in, custom -> native is lossless only
if channels have no custom names (and possible only if the ids are
within UINT64_MAX and in order). Anything to Unspec is always lossy, etc.
Custom -> Ambi: Possible only if it contains ambi channels. Lossless.
Custom -> Native: Possible only if has no ambi channels and all ids < 64
and in order. Lossy if it has custom names, otherwise lossless.
Ambi -> Custom: Lossless.
Ambi -> Native: Not possible.
Native -> Custom: Lossless.
Native -> Ambi: Not possible.
Any -> Unspec: Possible but lossy.
So 0 for lossless, 1 for lossy, ENOSYS for not possible.
_______________________________________________
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".
next prev parent reply other threads:[~2024-02-02 12:56 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-29 23:27 [FFmpeg-devel] [PATCH 1/5] avformat/mov_chan: do not assume channels are in native order Marton Balint
2024-01-29 23:27 ` [FFmpeg-devel] [PATCH 2/5] avformat/mov_chan: never override number of channels based on chan atom Marton Balint
2024-01-29 23:27 ` [FFmpeg-devel] [PATCH 3/5] avutil/channel_layout: add av_channel_layout_from_custom() Marton Balint
2024-02-01 8:56 ` Anton Khirnov
2024-02-01 20:01 ` Marton Balint
2024-02-02 4:42 ` Anton Khirnov
2024-01-29 23:27 ` [FFmpeg-devel] [PATCH 4/5] avutil/channel_layout: add av_channel_layout_retype() Marton Balint
2024-01-31 23:01 ` [FFmpeg-devel] [PATCH v2 " Marton Balint
2024-02-01 9:02 ` Anton Khirnov
2024-02-01 20:36 ` Marton Balint
2024-02-03 16:19 ` Anton Khirnov
2024-02-02 12:56 ` James Almer [this message]
2024-02-03 10:38 ` [FFmpeg-devel] [PATCH " Anton Khirnov
2024-02-03 13:24 ` James Almer
2024-02-04 19:28 ` [FFmpeg-devel] [PATCH v2 3/5] avutil/channel_layout: add av_channel_layout_custom_init() Marton Balint
2024-02-04 19:28 ` [FFmpeg-devel] [PATCH v2 4/5] avutil/channel_layout: add av_channel_layout_retype() Marton Balint
2024-02-09 15:10 ` Anton Khirnov
2024-02-11 22:38 ` Marton Balint
2024-02-11 22:51 ` James Almer
2024-02-11 23:03 ` Marton Balint
2024-02-04 19:28 ` [FFmpeg-devel] [PATCH v2 5/5] avformat/mov_chan: add support for reading custom channel layouts when layout_tag == 0 Marton Balint
2024-02-08 20:16 ` [FFmpeg-devel] [PATCH v3 " Marton Balint
2024-01-29 23:27 ` [FFmpeg-devel] [PATCH " Marton Balint
2024-02-08 19:25 ` [FFmpeg-devel] [PATCH 1/5] avformat/mov_chan: do not assume channels are in native order Marton Balint
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3677f954-85ec-4098-a6da-5f3c5dd40873@gmail.com \
--to=jamrial@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git