From patchwork Sun Sep 19 04:46:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30371 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp394302iob; Sat, 18 Sep 2021 21:47:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNePhSaJw+3tw1sQ/sttD9H3d0jcfnV9gTBWn+e0UE+MA1KgtXh61sJjN1td0d563FImwy X-Received: by 2002:a50:d989:: with SMTP id w9mr22418325edj.99.1632026839819; Sat, 18 Sep 2021 21:47:19 -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 r24si2402614ejy.194.2021.09.18.21.47.19; Sat, 18 Sep 2021 21:47:19 -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=HS4SxAyC; 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 E847268B1CE; Sun, 19 Sep 2021 07:47:13 +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-db8eur05olkn2105.outbound.protection.outlook.com [40.92.89.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C42668B1C1 for ; Sun, 19 Sep 2021 07:47:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ABrvXIaO7pYmQQo1HAktg5Exx8Gka9jxvFYvyJmHpKawyid0/2/PWOEZ1TGyI8Jv6eNU/UZa/SMGeCRFeUR+M1qHWGq0U72y+91FRfr+cfSghZdrITtsKkZSKodHK21t9m+WBsaTu1VQH1TLWV9QqXTyilqIZE3LDzCGeV8Tw5gZBAJaBIWOM6JerxZ1OMUK3KkJKLF3pSGvWicBlAB0CAic8nU3FeM39/EGkx6+2uwK+wlXBGe+MFmi5yHDOElPkpMvo5a12lUtGMZAk9yJ9xLZMCrsKDKDW/NVFDpdg3HVTNZfp/ta49As5wUKurHzKO8HqIgO13BWf19iUbb2dA== 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; bh=o5Mo1UhW2g1GT+bSIfjB0Cq1fNtKqzfgJQUSwtTsohI=; b=ZPUF1FP76DzQ7dBJ/7QtKnJRb05jWlSCIuXTzOOISwB0lFx+JzjtQjRDonCTV75HOKkZ7wTcpDwL3FjhpLdOhxBuRDzPbxAWaPmFdSHO4R8vO1NftzAiKoKvpblhBcRjZXQFOlH3WCJ8a4lVnlU1oEvx/KKdLEoTtOyN/ooC/r7EKowBa9jXrjFrZi5//w59XteFjjuGTW3FdiCXM6BrYNfB6bQQ2OCksIop1dyFwaoUiPQlQ7nZwdSWi1Fg9cDfP5BNNyF6I1CnSXQyyIyfCzdGWa923Z2zQgsC2uNHDKkq15SwM97Xku5isEX+scR+cpZC7++DYsINOG9kc11Uiw== 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=o5Mo1UhW2g1GT+bSIfjB0Cq1fNtKqzfgJQUSwtTsohI=; b=HS4SxAyC0sEWibgGorhTFSB/SHbx2ieonpH+NeWnNmFDftrBYkdn+06E+rNB7KNv0bFIE1OFHKuGucRyrw8u4G545lg7oktE0HvI9bPxx44iEvfzGgjlzKVqsiwhYra8Fp1D5V4ixrQssjxm1i1O4Vca+WgONbEN0O3ivUFBNSnP9j0OZgb8axAH3COORTE0zSmWiy8GxbtC4io8HHamMbjicWYlinNAPEluRzJqRgF0VvdNNQJHdC6cVk70yTdOfIbJm8fqdbVWZf67Aaw3BeDvXvKN4yf1qc7WZOrElMXLoDwEMZ893LvJsmmukTTAR2KrELppYa6t7dWpp+0GLA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7509.eurprd03.prod.outlook.com (2603:10a6:20b:2e2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.16; Sun, 19 Sep 2021 04:47:03 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.016; Sun, 19 Sep 2021 04:47:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Sep 2021 06:46:52 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [EKf+2duMReFjS1za/7dgCLB4bKoN23jk] X-ClientProxiedBy: PR0P264CA0125.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1a::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210919044653.2671450-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0125.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Sun, 19 Sep 2021 04:47:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 14311090-90b0-477b-6a29-08d97b288616 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWoRMOa5xb2sQWQKjwT7ylwVFJH8KTnwCgaqPES6pexBMLBmPQ982PAFkhl+qFxjpEgr1pW0LQKshcRDIB3JDxwfZzGfc2c4L3a1BTtEIlu9Yq1GFuI5a7Le8fm3VAZIzCMD/J4O1LWEgVlXrJoH5rQtZjHqVvKX4VlYxZdF3PgtAx3dx550xsU6tp2rc/Fgb3PLd3hfOaOYbiTT7xY4jjiWtSqETtu5BiiTNeKb4y+c303KnLh/ORatyZyJVNN4/qF9tCNoFJ15Hqt/rh4y4+o63el6uhUWRUKlfW+cbDWlsiMy9akPsPKLL7NpY40EMnrKnYplJWRpumBPGu21OQMzWJyFXL4dJIny0VkxSXc2bOw7Og9xaNd/HnSJLuYVPUQeOTSbE2DMKNzG/PnyJzmFPchEnjvYFknxPlQ6xTNVuXWURoDa56uur8hQEdwy9scSyoTcfqOwO2cWuAtljXTCZprM8cS+keubht1mkD/38fyWCFsNlu8+uZxT5jb11U8EWxnyM9DoLtOfTrwlxYULSFluyr9rH2Hs2i/1rLjsr5U87+0ZnTaLf5CEO9oIh+DKRAwyF65Yzyyyi7dFP6jO/+Gjwl4ySW5CAKa5vKiUADu5SUifQVQfw981O6WvYw0sQ3pVdHDpivlvmBhG0YuIsEBv65mSPTs19fsS8hdV8duNTYslLC3kSy9lAKLT5Yj2MmO1ZzcZ8zorHKzcGrQYqEFIl0ZHUM= X-MS-TrafficTypeDiagnostic: AS8PR03MB7509: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w/DYQRbPEOhKdwemYHqjibZR4XJ7URWmj6G/+mUj6zUcydyvnHIT7HDRDHRZsSTHmHYcCnjnXZFQFj+M9F0v1G4KScZxkTlzCf5Evw2M8zQsyml4qYvU3ST9RontP0tzWAiONP/SrWLHk8GyY+NtC/znhweaTO7j7Kl3RjIJofbLUbChwytxGDBkC9V9nMnfnhLS0efNM317KXG5rOQhFUkTynT7zYuvfNhxXaSKgql1iZHIWzo/aHsj7NAu+GBwzsFyU4uPaxoUTDHsLhf5zboc2xU8QrVvewxYZ1lnTdgU+aSuQm8STIP8bunb1qX1ZT8XrGR7FgRLQ4RtJCvud/Ylpqfbe1H42K/r/wnT2+y9LbstxPPt9UZPTTKDSB0NYP+6H3P2nIecj1I+5aLprHWY+lDVVir9JLJoLvlOulJ8yAteKfpF/iu+7y0zTXrK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: r6cfqi/UxBHvpQRQJSEjcQL0x9/FHc+A2rtSg4R0pyAytiCkW1Cvpj4v8NdRVXj7v3/MRv3AHaa0c/91MaOP/7BLXtTqL5s4qfzIzwLBdCjqpnvm7hC2Wme9e4gC+JW+3LZMiAgoT1zQXlF+6UBZWA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14311090-90b0-477b-6a29-08d97b288616 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2021 04:47:03.0240 (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: AS8PR03MB7509 Subject: [FFmpeg-devel] [PATCH 3/4] avfilter/vf_convolve: Deduplicate framesync auxiliary functions 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: d3tJjkzZmi2A Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_convolve.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_convolve.c b/libavfilter/vf_convolve.c index ab6d1a271f..2fa33587e3 100644 --- a/libavfilter/vf_convolve.c +++ b/libavfilter/vf_convolve.c @@ -655,9 +655,11 @@ static const AVFilterPad convolve_outputs[] = { }, }; +FRAMESYNC_AUXILIARY_FUNCS(convolve, ConvolveContext, fs) + #if CONFIG_CONVOLVE_FILTER -FRAMESYNC_DEFINE_CLASS(convolve, ConvolveContext, fs); +FRAMESYNC_DEFINE_PURE_CLASS(convolve, "convolve", convolve, convolve_options); const AVFilter ff_vf_convolve = { .name = "convolve", @@ -687,12 +689,12 @@ static const AVOption deconvolve_options[] = { { NULL }, }; -FRAMESYNC_DEFINE_CLASS(deconvolve, ConvolveContext, fs); +FRAMESYNC_DEFINE_PURE_CLASS(deconvolve, "deconvolve", convolve, deconvolve_options); const AVFilter ff_vf_deconvolve = { .name = "deconvolve", .description = NULL_IF_CONFIG_SMALL("Deconvolve first video stream with second video stream."), - .preinit = deconvolve_framesync_preinit, + .preinit = convolve_framesync_preinit, .init = init, .uninit = uninit, .query_formats = query_formats,