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 DE490490D9 for ; Fri, 2 Feb 2024 12:56:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8F4D268D0F2; Fri, 2 Feb 2024 14:56:11 +0200 (EET) Received: from mail-oo1-f53.google.com (mail-oo1-f53.google.com [209.85.161.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3A1C68C94B for ; Fri, 2 Feb 2024 14:56:04 +0200 (EET) Received: by mail-oo1-f53.google.com with SMTP id 006d021491bc7-59a33aa7ee4so852698eaf.0 for ; Fri, 02 Feb 2024 04:56:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706878562; x=1707483362; 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=OUCQW+ZakI3bsgXK7gFk1UwbuQZhi7Q0UJeOIlkmT6I=; b=j0VAgywSd6XYlzArNodYUJKWOgPKUAPh0IRraE5twzvOCLLTKZfd1sNnsAKvEwva2e eHDLgy/BvaZVMo1huiY2hQ24vbZ9wVKqKHNWPTjWaBa4zD6XPUGW+VbKMEu8hNCEJ9Dy hHpYknJJeTTyysQas/2i7svAQnnScsV553TjBdGl82nSR2hoOJOqkXN6nsLNqdFlkyj4 Ce3Eow5DTjhyzpnxhqprh3pjgHOwu7CI+hh44cX5At3zKqfe2KyfDAIsZBZ1eq1hDfzB 4n6tFpLeHzfYKECfgaOfHy8zvTAnYqT25BaGleEbXft6kVDQgo0NLrlBZGdOwafI75E6 f9LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706878562; x=1707483362; 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=OUCQW+ZakI3bsgXK7gFk1UwbuQZhi7Q0UJeOIlkmT6I=; b=TXYJekLMAmj0emCokhqMwmjdljtoBP14GDTQy9no3XpfyHxGIy1kr++YV1tBRLO6FM L82/iIX7WF3wlKGQOlDRjjyjuAHB00vC2TuInE4IrD1ttB7HGFCwKtL0+aOBp6auDOg9 3zmXgdK2cYCDNorhEOVU6BwRwwxfr71Idt9vw/TTMZ3xMjowNoWp6Mx4yAFyxVMtdmd6 0/hAsGkKEHnthmcmnE69bqsn1Njx9jJoEtuH2cOBqSGnwTKuptv+obGVxBHv6my3tqYl a3ZqDsLpU8z68B8lWgF4iqr/sy7cCsWJiQE6amDDCDrNgI+QyLeiodchCAEi1eVaYBEG XYDg== X-Gm-Message-State: AOJu0YwavvG8yExCbtMArxOqsSWk16pSwH2xDJVuKBvK7FAOuxKEZe4u IHU0AjMtED0F50T6E+BYbUdC7p9M7cLsIPPq6RXYbeukR6cA4j+/DcCb2zF+ X-Google-Smtp-Source: AGHT+IEg6le7Sab1v219UkhJgjkG7O7nIHdjQiHuP+Pg3B4G4AUOhKU6z1MRrqwIlBa6Vs3ZwAqALA== X-Received: by 2002:a05:6358:9999:b0:178:c302:b799 with SMTP id j25-20020a056358999900b00178c302b799mr1509911rwb.12.1706878561851; Fri, 02 Feb 2024 04:56:01 -0800 (PST) Received: from [192.168.0.18] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id c17-20020a63ef51000000b005ce472f2d0fsm1474520pgk.66.2024.02.02.04.56.00 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 02 Feb 2024 04:56:01 -0800 (PST) Message-ID: <3677f954-85ec-4098-a6da-5f3c5dd40873@gmail.com> Date: Fri, 2 Feb 2024 09:56:31 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240129232755.9622-1-cus@passwd.hu> <20240129232755.9622-4-cus@passwd.hu> 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: <20240129232755.9622-4-cus@passwd.hu> Subject: Re: [FFmpeg-devel] [PATCH 4/5] avutil/channel_layout: add av_channel_layout_retype() 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 1/29/2024 8:27 PM, Marton Balint wrote: > Signed-off-by: Marton Balint > --- > 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".