From patchwork Fri Aug 5 23:17:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 37156 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp738110pzg; Sat, 6 Aug 2022 04:39:57 -0700 (PDT) X-Google-Smtp-Source: AA6agR6rT0K7qvxnxhcJ05mPAjCNTNPXbATQzqvY+VEWzFlUvlZIfTfxVmCjGatKAfK4Olt52ujo X-Received: by 2002:a17:906:7955:b0:72f:5c1f:1816 with SMTP id l21-20020a170906795500b0072f5c1f1816mr8322851ejo.396.1659785997052; Sat, 06 Aug 2022 04:39:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659785997; cv=none; d=google.com; s=arc-20160816; b=pEhQ8TRzicBgEFvfS6T0EDRzQpAmJa/sRnzNophFfB96Lai1BqOdsUgWfz3xv9jgYM bPgLS9b5H0ATv9Kf7oBu9K2tCC3AfmtG4smhPxp+PdlS57VsZtPok2F2hjLVFVPqHBAz bDl2nx6VSO1g2FxrUXWZgK2grg5y0Exy54ID4eM4+/Wjddd7UDa4ef/3QX6nPgbqbIWA r7d9EwIr2+3KYabfXJa7EV4dcADNvKUxJo8iYKpz0gWQDH1h7h1ynjNEOL4vGlNmE/v7 zIY54gDL/ljT149NzD5zAnuUEXYgjwHUAAY+G2CX3YY1lo51IcaP9hyTW74laoHtUGSM 2cUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=uQrOTXk35RQDWfITVibFm28fA7d6r4bY7Xlw4uMHjYw=; b=MZ5AsMV/q1OUBBhVjHfpIvaz0AtV5rH7TtotzymU4vQamHvl7E0J/7ne3aEUBT2caC W+8rfCVq3E/LQUGj/L9w6VCs5pM0jZsnE2jNYFQrVrsJYr9NjlXljE9ZYGF+PVZ7e5Lm A/Tjhtb9euT4d170kG9Aop7ICz9ot13fubAH8Y5fM40735J03wPgyh0tZGjk3d6L+IRO gxcIZ7/+ZdAnC9kE2hA6MW5lbG8J2my2e61jZb/uhBXJmuGvhE8hMuC0D/J+GlhVpHGY wpSjGkLmLzfFHxGyatdHNTh2xmkULnLFIV7UUemjCEyar/6eTZAIgzkVlz7mhhbRGhtc lmFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Bu6lAxVX; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v25-20020a17090690d900b00730aa17d032si5864479ejw.337.2022.08.06.04.39.56; Sat, 06 Aug 2022 04:39:57 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Bu6lAxVX; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D32868B712; Sat, 6 Aug 2022 14:39:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f48.google.com (mail-vs1-f48.google.com [209.85.217.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B0C4968B4F5 for ; Sat, 6 Aug 2022 14:39:47 +0300 (EEST) Received: by mail-vs1-f48.google.com with SMTP id b124so4741093vsc.9 for ; Sat, 06 Aug 2022 04:39:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc; bh=e/acxlhniUJekVvAA3q7G4C0ICgndknMH6rNmajp/GY=; b=Bu6lAxVXjkMw/BmeYyVvP/SAjAOgIHqDiBJLjU5qwlhkGN6l3vZjvtcSWbsTETQ0yp 8mOB0+865RFadb0dwaQppJg4S46gIdOAFN5EsAi1WSUYq5itEnQHdNIXbbIhGwo97GqT pHdubr9S8FER3qHYETUE2R1gubOnkqjyKUWEO2ZTvGUUHUsyq9+uW1EzGZ6Aqle9D/Db YsBOQov7CpCF5u8Mk4unlDcIOMdTKjnX2P7CyuGs/HPFoPTzSsDjJ77A9gVyESV0LsQJ /H6/UBwjXfSxJ6dbac0dHnRO8XFJ/Ewe1ReVjlOSRriuJASd9AKjcwAtzo7WOpAYpymA cJfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=e/acxlhniUJekVvAA3q7G4C0ICgndknMH6rNmajp/GY=; b=PvHqJA06f682fN5JrCLhzN9aCGLvBwdtjbIsny2uGgadH6BsMgTZtjJK+QHaqqTqBC 9x7PNQ53AtrXvE1/PjUImmzDyHJoRrbMhmnf/46vKYVY9Ck7Ijzj9pRBXAzy0y2MpK50 4qcA2PZ41ve+YTWVkm21248mwU1Zh24i4JeyPIRFTBJeKej0CmjnAwjX1A/RDBMBf6+0 P/MMW8NS/F8uq3P9Ya/X8lBTXRMVfOQRRGalBlTIYpiEUCSDT1bDk0JfGNmaARgu+atu tUXzvUKbz0npqkG4XmQY+CErYjU9ebZVQoRVGF83Nb0L+/55Kp3cR2gY3urrnnZQQfXb 3wRw== X-Gm-Message-State: ACgBeo2iYzVc+INammpA9S9amuyQCiVdjyNKzbMLC5sq4Mp+Mn0JXaZb l2GwFJmOIl2jQBqM/Wv7dwrTknrcGXc= X-Received: by 2002:a67:c39c:0:b0:388:1e6:6637 with SMTP id s28-20020a67c39c000000b0038801e66637mr3703813vsj.81.1659741494038; Fri, 05 Aug 2022 16:18:14 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id k23-20020a67e3d7000000b0038855ac0416sm3720997vsm.7.2022.08.05.16.18.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Aug 2022 16:18:13 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Aug 2022 20:17:59 -0300 Message-Id: <20220805231759.2922-1-jamrial@gmail.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/avfiltergraph: remove unnecessary channel layout copy 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KNeFpre7fEzB It's not modified, so we can simply use a const pointer to it. Also check the return value of the other copy in the function while at it. Signed-off-by: James Almer --- libavfilter/avfiltergraph.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index b7dbfc063b..53f468494d 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -729,12 +729,12 @@ static int reduce_formats_on_filter(AVFilterContext *filter) /* reduce channel layouts */ for (i = 0; i < filter->nb_inputs; i++) { AVFilterLink *inlink = filter->inputs[i]; - AVChannelLayout fmt = { 0 }; + const AVChannelLayout *fmt; if (!inlink->outcfg.channel_layouts || inlink->outcfg.channel_layouts->nb_channel_layouts != 1) continue; - av_channel_layout_copy(&fmt, &inlink->outcfg.channel_layouts->channel_layouts[0]); + fmt = &inlink->outcfg.channel_layouts->channel_layouts[0]; for (j = 0; j < filter->nb_outputs; j++) { AVFilterLink *outlink = filter->outputs[j]; @@ -745,24 +745,25 @@ static int reduce_formats_on_filter(AVFilterContext *filter) continue; if (fmts->all_layouts && - (KNOWN(&fmt) || fmts->all_counts)) { + (KNOWN(fmt) || fmts->all_counts)) { /* Turn the infinite list into a singleton */ fmts->all_layouts = fmts->all_counts = 0; - if (ff_add_channel_layout(&outlink->incfg.channel_layouts, &fmt) < 0) + if (ff_add_channel_layout(&outlink->incfg.channel_layouts, fmt) < 0) ret = 1; break; } for (k = 0; k < outlink->incfg.channel_layouts->nb_channel_layouts; k++) { - if (!av_channel_layout_compare(&fmts->channel_layouts[k], &fmt)) { - av_channel_layout_copy(&fmts->channel_layouts[0], &fmt); + if (!av_channel_layout_compare(&fmts->channel_layouts[k], fmt)) { + ret = av_channel_layout_copy(&fmts->channel_layouts[0], fmt); + if (ret < 0) + return ret; fmts->nb_channel_layouts = 1; ret = 1; break; } } } - av_channel_layout_uninit(&fmt); } return ret;