From patchwork Tue Aug 10 17:27:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29397 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp645454iod; Tue, 10 Aug 2021 10:28:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0OpSgG7RPIAzQXsd1GzDx6gFR4jtdaApTi9wFNjuiIaNQcuaJzTGLilyZSuRbc6qcckCH X-Received: by 2002:aa7:d815:: with SMTP id v21mr6170976edq.262.1628616493850; Tue, 10 Aug 2021 10:28:13 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q26si20649931ejr.617.2021.08.10.10.28.12; Tue, 10 Aug 2021 10:28:13 -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=@outlook.com header.s=selector1 header.b="Jg3/Qf55"; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 55EFD68A17B; Tue, 10 Aug 2021 20:28:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2073.outbound.protection.outlook.com [40.92.89.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8479680549 for ; Tue, 10 Aug 2021 20:28:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P0an79KyGjiV8IIn7WIlsJ/JBcHznbkWqBOFdkEq3Gy3yN/eMjAjezGZ0XpHRDjL1WsGR6B23bXrFlJVTuQ9jROl/RwmnG1ODJhzVJhmbbxwMW7HJMhmHrnG93XMFfre7ETJN3bhWM+pHjmTpeUkMTfDTbHD6in7TfMrvSLirm29hgw9UcNxyeW+wAZzDN+E/M34V7EeQC3dhBIeqx2U19sUYd65p7yvsrgVqLh/si1IcnChtHeimM/cb2yMvVKDxZOtPk7xpjZaPTk+hp4PdomnH3+RmESzX/Cu8qvD9NPOAXuuPyq9fM4a3dr7rHy9+sD/wIQdsqyeBnpkIKtzhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=O5bhCRfpoShC4rnEDCa+8ayT7zZoC3TQDTfJjjIbsMY=; b=QWfxa00o++3FT9MVT2PE49bkS/Jaw9Qruu2jZQZ76XiLK/rhches0ntwjPK4TyerYlrQzBTbCaRsh+yldasR8nduz/F5gCI/lvqt8J5+ZLfRNb1qXGYJy5pVqCexMy4A7EKhLG7gKZNbXcnyxIG6lt6u1McBuTCbf9ND7U4kzSBQCDz4oznyyNFqLJtreOLoTjjxXAN4PVhTZqT0Q/rrQvLPd7TLexDbQh/WfuKWi3osy6OaXzeSCkK9cs6w1IwEgKKkYs3qvirHe6ObO3BCnQKWBFIvhLaCG45PyLVgEUDHDdYFjB3BNRYgbgc99dRCgTJpaoUTJ6iFomQxAk8JuQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=O5bhCRfpoShC4rnEDCa+8ayT7zZoC3TQDTfJjjIbsMY=; b=Jg3/Qf551fSlzBL+zX7Sj7YcfIWlNC2nBcUspuezJaAMg7oAzmjYoCs0G40C1tZMEFqBoIhvlypFviiYuMu9c7yRnTIhVSDcBg+u0j16HoTmkWAezIW6a8/1IXUB843eDhSw+tGJLuQyy5cWGPloX2pCmlGXNXypiQAfSxiE/3dIBUJc+DY8fibrItDXsKCf3r8FodYfb9PwuKB6gX17Sp5INYMaXNUTrprfI9rc+RxkKPJZoV+5DlD1yam9/ExpfsAlEYTSodtC3d9kgFh0Fn/ltKeNIJ+/ZSPdDSm0uKkBvPQPYT1XnL/V3jST998kHXCpbxYumrp6MF6xxUm4Xg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3191.eurprd03.prod.outlook.com (2603:10a6:209:19::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15; Tue, 10 Aug 2021 17:27:48 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d%3]) with mapi id 15.20.4394.023; Tue, 10 Aug 2021 17:27:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Aug 2021 19:27:37 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [aFbO9x/4rnyOcP1ps1U0z6wBL2hj3Ggw] X-ClientProxiedBy: PR3P191CA0037.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::12) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210810172737.562915-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.95.102) by PR3P191CA0037.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.21 via Frontend Transport; Tue, 10 Aug 2021 17:27:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 434b8e8e-c6b5-4abc-ec6b-08d95c242c0d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z+tx7PLtfA1zAKE2mg5f1EGOWiIVUVciVCgx27YULQ0l1Gv2i0OCvMR2H6RY+cN1c8Zqv/R2S092dM+KkmHSAzjAanx6g9ZeIQ+b6YO4p35HFjMmNEDL8JKLKMTJ8FtjP6Lto4FAfaRrhQVs26IlPdv1cNEWu08nUshjKSf14Qbi2nkI3IDBfrqWbK+aP51usgN3V0p5dczTAdiYCtKpgFjRSpuWqcVgkuQTMwb6OJ9s/IQef1gq5gPTn73It19PcLDy9piUSsXYrQXoQYYOdJA+w10+VNqTcN06kZZrxRJu9HgqdlZMrrsl7kiD/T3LMC7XCJ2wsmFfhrckQ+5HDPdfM/AwSIN9I9bpy41t/zHle0+0D52D4CLEmbI14Oit/01/Yh3wGQePrjnNV5oiFZ4Ra5QuB05DT/1/vOYfrNxETMEtO8n+iAi3z0yMltJ5GQrCpygAT0nbS84PBlzggAmTJECz/y8wP2YKGeLAXVy7zhaeOiT+XD9GS9HbJT1kbY04N3uwzXYLrZhHcnILhMVONlx9ec3ueJHE5OPhCTLiKaLJrYX5wT0+sKdAJxyssMXRDJ1OXB6ZbL8PiWFv2vEa57Fc1+vzXdiG+rR0+lDmmfVQqAPCQ9E2HBY0drMW4Gp1WK4iHNMIActLopn3iI0IlcHeFBw9T6v6IAbxcady7WqeLbHMN58363/efMEtkhEMNhJpJC/o7S6qyG2z4kqN6H8JaGtjD/PSohq54F+0Zwz2T/i498I= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3191: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XnorWdtL4NtP8eX8r+kK1QsoZCFsVrmzXZYuBGuK9LKAOqhzaZxNFrCKTuh9Ms9AasiTtphJbt7t10I8oBJK2Y/iu5DIRvphBwyQSA8KNsJfxbr8oi2vr4FjjKk7tiB8S8Ut5vZkQul8TDXWavpAyEKG8ELaAaRNOYBQ9NFePhxsasmiEqGEQ6lZdn7Ja8A3lGJLJqZa7ZaUUdz1aHWbYGY367vwwduTn4lR/doKMqZtjn3ocyYSDOTtPLDDJtd5LJDA61r9r777oaD+9ZJeJ0wHCamBegtyn6lc0CIt6OHbIvLXTIeu1Pv1AOgfxWnmEIk6+auQ3Hui+KVp1GVwn5qGRdjdz2Ms4SxMDSP8BIAr3Qv+H6mjQMqMlZp+5vq3CAKSIkeRA59Iwd33x0y/YcQrrRZd6AFvwAK2NYwZ4fpTHWWkWPJPpbNK78jrKCEo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5VEEqIoxoSLG8OVRhf5ELGf8Sgt+qNgvOAm8ZNkgk6c5mZpuGuBaAOkMILyMX3F9AAY7WM9K3oQnqfAliKCuAU8OrDYAcDnKM34Xo7OGWxic7kD+w5QXpm37lBYyqyATFufiNTCKJe2kfn5OEhqqcA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 434b8e8e-c6b5-4abc-ec6b-08d95c242c0d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2021 17:27:48.0320 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0302MB3191 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_scale: Avoid unnecessary indirection 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LNKzeegIN2YG Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_scale.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index aa855b894a..160ad8b584 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -530,31 +530,31 @@ static int config_props(AVFilterLink *outlink) for (i = 0; i < 3; i++) { int in_v_chr_pos = scale->in_v_chr_pos, out_v_chr_pos = scale->out_v_chr_pos; - struct SwsContext **s = swscs[i]; - *s = sws_alloc_context(); - if (!*s) + struct SwsContext *const s = sws_alloc_context(); + if (!s) return AVERROR(ENOMEM); - - av_opt_set_int(*s, "srcw", inlink0 ->w, 0); - av_opt_set_int(*s, "srch", inlink0 ->h >> !!i, 0); - av_opt_set_int(*s, "src_format", inlink0->format, 0); - av_opt_set_int(*s, "dstw", outlink->w, 0); - av_opt_set_int(*s, "dsth", outlink->h >> !!i, 0); - av_opt_set_int(*s, "dst_format", outfmt, 0); - av_opt_set_int(*s, "sws_flags", scale->flags, 0); - av_opt_set_int(*s, "param0", scale->param[0], 0); - av_opt_set_int(*s, "param1", scale->param[1], 0); + *swscs[i] = s; + + av_opt_set_int(s, "srcw", inlink0 ->w, 0); + av_opt_set_int(s, "srch", inlink0 ->h >> !!i, 0); + av_opt_set_int(s, "src_format", inlink0->format, 0); + av_opt_set_int(s, "dstw", outlink->w, 0); + av_opt_set_int(s, "dsth", outlink->h >> !!i, 0); + av_opt_set_int(s, "dst_format", outfmt, 0); + av_opt_set_int(s, "sws_flags", scale->flags, 0); + av_opt_set_int(s, "param0", scale->param[0], 0); + av_opt_set_int(s, "param1", scale->param[1], 0); if (scale->in_range != AVCOL_RANGE_UNSPECIFIED) - av_opt_set_int(*s, "src_range", + av_opt_set_int(s, "src_range", scale->in_range == AVCOL_RANGE_JPEG, 0); if (scale->out_range != AVCOL_RANGE_UNSPECIFIED) - av_opt_set_int(*s, "dst_range", + av_opt_set_int(s, "dst_range", scale->out_range == AVCOL_RANGE_JPEG, 0); if (scale->opts) { AVDictionaryEntry *e = NULL; while ((e = av_dict_get(scale->opts, "", e, AV_DICT_IGNORE_SUFFIX))) { - if ((ret = av_opt_set(*s, e->key, e->value, 0)) < 0) + if ((ret = av_opt_set(s, e->key, e->value, 0)) < 0) return ret; } } @@ -569,12 +569,12 @@ static int config_props(AVFilterLink *outlink) out_v_chr_pos = (i == 0) ? 128 : (i == 1) ? 64 : 192; } - av_opt_set_int(*s, "src_h_chr_pos", scale->in_h_chr_pos, 0); - av_opt_set_int(*s, "src_v_chr_pos", in_v_chr_pos, 0); - av_opt_set_int(*s, "dst_h_chr_pos", scale->out_h_chr_pos, 0); - av_opt_set_int(*s, "dst_v_chr_pos", out_v_chr_pos, 0); + av_opt_set_int(s, "src_h_chr_pos", scale->in_h_chr_pos, 0); + av_opt_set_int(s, "src_v_chr_pos", in_v_chr_pos, 0); + av_opt_set_int(s, "dst_h_chr_pos", scale->out_h_chr_pos, 0); + av_opt_set_int(s, "dst_v_chr_pos", out_v_chr_pos, 0); - if ((ret = sws_init_context(*s, NULL, NULL)) < 0) + if ((ret = sws_init_context(s, NULL, NULL)) < 0) return ret; if (!scale->interlaced) break;