From patchwork Tue Mar 15 20:30:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 34779 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp3327953nkb; Tue, 15 Mar 2022 13:30:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8DIZclU+X5kDx3JxzLIGEOuv6rASHC/FlSV9/kWAiAek8y98HwEU1pvgLS9S/7JAbNwNV X-Received: by 2002:a05:6402:1c02:b0:415:f555:38ba with SMTP id ck2-20020a0564021c0200b00415f55538bamr26757766edb.357.1647376241367; Tue, 15 Mar 2022 13:30:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647376241; cv=none; d=google.com; s=arc-20160816; b=pQW2OFhS/Wz9mFY4xF5a9rrqZi3IPK3DdBqdbTJlooLQXzcZRaDMCXut3r7etqaZN6 Rtg3LpkxUV37eOvyRXKjIGg6zSBS8baiOi9yeqdxqKzgKHk9bLSHKHS4eGp4LbzNGgLp px2k3pfSDLEM8aw7axJRhZMdfeVn+vdKAb3bcBCRBLkk/pC1MVfKIaGy59BR1s/QhyDJ Fkp+v/lYw+qPXsUg8HOkIix0bX6dyiS2cM19+ywZHDVZP1qEClEM2J+OuedaEZ3V9I9z IlyGAJBAqJIsux2daTV4EnuVbBInvRY7rt5iXq/0yA9Tn2HkbPYF2rJBpP9MVHffBTjB wJ0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=w7nBufnz6Q55y/fhC26pGnAEjHJ+I6gwsKM/rsF+vK4=; b=gvhrNRO/t+PtMrSopFsY1ZBD8GwSk2OqBSRlOl7H8G6cRTB3QZzgb/7vWQgELSvmN0 frB5Q8GT7bunlcTs9i/OYKByYweDB6HtaEwNsbJ6k87IYzW5lgvz9tUZ22EHM59AH/4v 9R6h+sreMqp30icavwPEM1CUlW2Hzo+VbgUcGc5crc67OILrhLPwusjE/i+glwx96IGO tRCL6Iay+wPDxJtJAICEc8lxZi1lJt9osrnEIGtEPbANttGq5Y3NB0TS1HMHN1gSflqA ZHPP16dUa+h3CPAB978pUt3TvxKASmXwCtuMTnYQEPqNdhNSjSvPl/3shpoDqwhE43gl TvpA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w8-20020a056402268800b0041660c6921bsi82163edd.98.2022.03.15.13.30.40; Tue, 15 Mar 2022 13:30:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 954F968B080; Tue, 15 Mar 2022 22:30:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4638368B0BE for ; Tue, 15 Mar 2022 22:30:23 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id A38B9E4F6F; Tue, 15 Mar 2022 21:30:23 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CIdYOvytdCBm; Tue, 15 Mar 2022 21:30:21 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 6FCBFE4DF2; Tue, 15 Mar 2022 21:30:21 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Mar 2022 21:30:11 +0100 Message-Id: <20220315203013.14304-2-cus@passwd.hu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220315203013.14304-1-cus@passwd.hu> References: <20220315203013.14304-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avutil/channel_layout: factorize ambisonic order detection 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 Cc: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NxvWGDUvHK2f Signed-off-by: Marton Balint --- libavutil/channel_layout.c | 40 ++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index c60ccf368f..fb2335a334 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -644,29 +644,29 @@ int av_channel_layout_copy(AVChannelLayout *dst, const AVChannelLayout *src) } /** - * If the custom layout is n-th order standard-order ambisonic, with optional - * extra non-diegetic channels at the end, write its string description in bp. - * Return a negative error code on error. + * If the layout is n-th order standard-order ambisonic, with optional + * extra non-diegetic channels at the end, return the order. + * Return a negative error code otherwise. */ -static int try_describe_ambisonic(AVBPrint *bp, const AVChannelLayout *channel_layout) +static int ambisonic_order(const AVChannelLayout *channel_layout) { int i, highest_ambi, order; highest_ambi = -1; - if (channel_layout->order == AV_CHANNEL_ORDER_AMBISONIC) + if (channel_layout->order == AV_CHANNEL_ORDER_AMBISONIC) { highest_ambi = channel_layout->nb_channels - av_popcount64(channel_layout->u.mask) - 1; - else { + } else if (channel_layout->order == AV_CHANNEL_ORDER_CUSTOM) { const AVChannelCustom *map = channel_layout->u.map; for (i = 0; i < channel_layout->nb_channels; i++) { int is_ambi = CHAN_IS_AMBI(map[i].id); /* ambisonic following non-ambisonic */ if (i > 0 && is_ambi && !CHAN_IS_AMBI(map[i - 1].id)) - return 0; + return AVERROR(EINVAL); /* non-default ordering */ if (is_ambi && map[i].id - AV_CHAN_AMBISONIC_BASE != i) - return 0; + return AVERROR(EINVAL); if (CHAN_IS_AMBI(map[i].id)) highest_ambi = i; @@ -674,17 +674,33 @@ static int try_describe_ambisonic(AVBPrint *bp, const AVChannelLayout *channel_l } /* no ambisonic channels*/ if (highest_ambi < 0) - return 0; + return AVERROR(EINVAL); order = floor(sqrt(highest_ambi)); /* incomplete order - some harmonics are missing */ if ((order + 1) * (order + 1) != highest_ambi + 1) + return AVERROR(EINVAL); + + return order; +} + +/** + * If the custom layout is n-th order standard-order ambisonic, with optional + * extra non-diegetic channels at the end, write its string description in bp. + * Return a negative error code on error. + */ +static int try_describe_ambisonic(AVBPrint *bp, const AVChannelLayout *channel_layout) +{ + int nb_ambi_channels; + int order = ambisonic_order(channel_layout); + if (order < 0) return 0; av_bprintf(bp, "ambisonic %d", order); /* extra channels present */ - if (highest_ambi < channel_layout->nb_channels - 1) { + nb_ambi_channels = (order + 1) * (order + 1); + if (nb_ambi_channels < channel_layout->nb_channels) { AVChannelLayout extra = { 0 }; char buf[128]; @@ -696,12 +712,12 @@ static int try_describe_ambisonic(AVBPrint *bp, const AVChannelLayout *channel_l const AVChannelCustom *map = channel_layout->u.map; extra.order = AV_CHANNEL_ORDER_CUSTOM; - extra.nb_channels = channel_layout->nb_channels - highest_ambi - 1; + extra.nb_channels = channel_layout->nb_channels - nb_ambi_channels; extra.u.map = av_calloc(extra.nb_channels, sizeof(*extra.u.map)); if (!extra.u.map) return AVERROR(ENOMEM); - memcpy(extra.u.map, &map[highest_ambi + 1], + memcpy(extra.u.map, &map[nb_ambi_channels], sizeof(*extra.u.map) * extra.nb_channels); }