From patchwork Tue Mar 15 20:30:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 34781 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp3328064nkb; Tue, 15 Mar 2022 13:30:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvCoq7ARylN2q6sU+NU35ghJrgu7Gwq6YfJunSO3ih0AgSw+Bo7rjbYxWIALIWL7SO80T2 X-Received: by 2002:a05:6402:430c:b0:416:c695:7c23 with SMTP id m12-20020a056402430c00b00416c6957c23mr23044492edc.367.1647376250131; Tue, 15 Mar 2022 13:30:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647376250; cv=none; d=google.com; s=arc-20160816; b=um46V7KnfWZqC3anKihEyhOJRuzsiR7ja+CPx/mNkbToXUMmA0tG8hs/rRpOCyREEo pvDpgPIepzgcXDkAR9sMQwuuhjkDfNvoilAoFnaYk8yRfo6BwTBYk3hf73UkBU7N0vGV ArT9cPzMRrHeM2jHTUWuirLG3d/CPjRWOz4cemBIhHM6bnMo0JAUqB7B0L7qiqmRxwjF zVyWbDqSaMLseJUyuo8rksMVjAjnrzrrxbahN1+s4+EspUM5oQtTMlXKkYyEUsnXkivc cRPv/75QjjWrYSfjTlqvJJLCZYzU+yV2PLjpbL3HZmMiAY6pYrl0msJJOat164BX71Uu CCvw== 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=ZpZo0iNrypL25HZMMcAvKz7EArZkfC9JCzxD9OUVChM=; b=oMd7rFo28mzaevD0ehyP0BgxcHwodgO9uJk6Zz00CzLDXTvdT0U8UiPIzINR6DL00I cG7YteB3eI9dIC3EJf8tcGIGQ686Id3zDeRkKr83rOhDfna7uABZixStfloP2eTuL+zz aE/Dg1Zf0u+zgQ2k40iL+Cl0SDgJrkU5LOYWkRDLbXH/ZZv2z0dqnEJ+MsMbrzpDc44c bNBs2FygnZdL7ojE1jYOSZH2iECgdpD5nSW+RmsfSgIoDqafc4otADdDTA7gvHcc1mcs 8AWW79mBbNt777LWc+9aMyvFpPjvcfthb9l++fcpZsAE7gL06V9yw2oWItWkW9Om3tHv js8w== 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 c4-20020a170906924400b006df69626abfsi22426ejx.75.2022.03.15.13.30.49; Tue, 15 Mar 2022 13:30:50 -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 47DAA68B143; Tue, 15 Mar 2022 22:30:33 +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 A518568B0FB 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 08273E4DF2; Tue, 15 Mar 2022 21:30:24 +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 I4mP-lMsEjb5; Tue, 15 Mar 2022 21:30:22 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id D11ECE5C3D; Tue, 15 Mar 2022 21:30:22 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Mar 2022 21:30:12 +0100 Message-Id: <20220315203013.14304-3-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 3/4] avutil/channel_layout: do not copy alloc new map for extra 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 Cc: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gS9dN/Ylrm8h Also use av_channel_layout_bprint directly for describing channel layout for extra channels. Signed-off-by: Marton Balint --- libavutil/channel_layout.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index fb2335a334..8406089fe0 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -702,29 +702,19 @@ static int try_describe_ambisonic(AVBPrint *bp, const AVChannelLayout *channel_l nb_ambi_channels = (order + 1) * (order + 1); if (nb_ambi_channels < channel_layout->nb_channels) { AVChannelLayout extra = { 0 }; - char buf[128]; if (channel_layout->order == AV_CHANNEL_ORDER_AMBISONIC) { extra.order = AV_CHANNEL_ORDER_NATIVE; extra.nb_channels = av_popcount64(channel_layout->u.mask); extra.u.mask = channel_layout->u.mask; } else { - const AVChannelCustom *map = channel_layout->u.map; - extra.order = AV_CHANNEL_ORDER_CUSTOM; 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[nb_ambi_channels], - sizeof(*extra.u.map) * extra.nb_channels); + extra.u.map = channel_layout->u.map + nb_ambi_channels; } - av_channel_layout_describe(&extra, buf, sizeof(buf)); - av_channel_layout_uninit(&extra); - - av_bprintf(bp, "+%s", buf); + av_bprint_chars(bp, '+', 1); + av_channel_layout_describe_bprint(&extra, bp); } return 0;