From patchwork Sun Sep 19 04:44:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30373 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp393276iob; Sat, 18 Sep 2021 21:44:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9ldHbATRsypmTHirdnfAzDgXY9geouSQMLJ8ijWDcfnDBK/vdvQ9o6q5Tieou8/uKWI/A X-Received: by 2002:a05:6402:319a:: with SMTP id di26mr22419765edb.84.1632026694549; Sat, 18 Sep 2021 21:44:54 -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 la2si12903226ejc.153.2021.09.18.21.44.53; Sat, 18 Sep 2021 21:44:54 -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=krq0iRZD; 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 EBFAF68B1A5; Sun, 19 Sep 2021 07:44:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071086.outbound.protection.outlook.com [40.92.71.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F1DF68B0F4 for ; Sun, 19 Sep 2021 07:44:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aOc6DQYAwPuMXosPbaT+5Zrx8thbPnxXRCWhoUVlFWeDQRglVplcPrMPujACR9wa2+0yxsIa9xkZshkfU5suaD04Q2wmWE7omgYI9p6uFBrKYG1RlWOsH3cB9lCd5NTHre0YOPYYhEXRY4VXeWwa31r4yzTNIwMNcGD/hR0RgA0fDQ1vIE50jZC1yefdc3GRntUYFPHIELNebwcnYCTRTJ7JZ0CeWoRpjvbr/44Z+8/swC7dD2IWJ6btks1rGKXv3+rbnjJnf6/IRUNjyNNFXqzEMiFNJJS4pC2gJljAlzf6UhjqZ/fRcH03ZUguZhUJphxuvKVe2U7Gk0pLYI+cLw== 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=l+pwsi7hLrbBZLu3rt5AjNeUqz7hvyA1AmcEfGZhGZs=; b=kIt6UvmFJ43ZW0KiEuMHJHqcc5jGUVHqUDfl3i5keP4YvHZNSgrdTWGPrNdCz4jZEBDOzm/tJ17mpsvCL1QtKpEELLMvAnsiiLNRN1CFC8o6xerPIGWJFK887jqoiyS/hFEorgHPG7C8lfVplllnw3P3zVsDPlk/5saKiiRUi+AkpzhkWgy9qqoiibE7+6qPqstWyjk0Z3+4ALPPeELDKafRhLKOEV9p6ErfBGvYq2MAUcMXomUvmH4452q2+TK1ZMXz/a/qkqR3YsO6fQ5HtwhVvRqrdsaV2+YOdPvBI3Hh8sVg8YaQs5WCVkMDOzg+frfjkzG9OQFK7UiksVH9/g== 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=l+pwsi7hLrbBZLu3rt5AjNeUqz7hvyA1AmcEfGZhGZs=; b=krq0iRZDf+rM8n6Opek+EioCjJspfvgwodchtzcgSmTuRzZXBg6aPgXIxWzB5AruvjZjdg9puh9LoTLTcvs6oL5eHX5h5CQBhNNSHFsNHR8nIDz52WtGyHhp4HLtiDDzFo0Z5zY90mIh3SQ8q+XNre92QsJQBCsro3yaNv2NujS1F+BDC94b6hnECIWU4IBc2Qe7WSA3Ck/6sCDFU1nJEJAXCf89haqY1vPVAtt9+Hz3vM7JNuL/b4TXe624fcIGJxH6PjYlNdmuvHxveRSG7gygMsQ/mB7dOlztn2OF3SZjHdI7klRfvHCtPoQlB8U/q7+nCNyKcrOrr2iKxUkc1A== 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:44:41 +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:44:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Sep 2021 06:44:30 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [syn9iauai/+xUA8VKcqyrY3E6YcLth85] X-ClientProxiedBy: PR3P191CA0010.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:54::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210919044433.2671282-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0010.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:54::15) 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:44:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5ea853da-26ad-4672-b817-08d97b283189 X-MS-Exchange-SLBlob-MailProps: EpEO96k6Wok6BVvod2FmIc/Zu5j76HoE7R8zeuBCXqnaxI1/PxIuNAzQP8LXcQHAM0yvWIyu+ld/pi2EQOT7oGbK/98tVdptWPomPUBVWzhyE+SJJgrleLdNBRHvtwacejQqKopkig6VBCEzscoQ6FscWsBY9gUtqfJmbnyzFeOCs8nnZoQHN1pWVl4xEJ0VKA7TuDQsBasxU5DTwQsH6c480l3i7m3Onyaw8EU+JtkvBmkDa0n5vOQf9/O3e/i0om/rNo0DNiv59USCdETG3JxKULONmdESmoz5zSfX4JwFEBtt6Mw/7DBEJKHWZFxtckohGPKX1PKPIq+4PJddD4WUqIGl9dGXdDUYv4l2ty125/aVCNVdSIgeDkwyegIOurPigjA1FzZDs3RF0BRmCRtt2W99k+ep3UKFl1Iw07uruCV3U5a+Xmz/ZuBA/5S1ZeD9lL04UCtBnZGdCVc81iX5SozXRDVMRVzJfTwgbw7PvMrsOjPc7NpggZwYXhb3/wmrOpOwD0Y4E/h4uWMF4lw6jIFgX+cfFG6JbkBtqiiO6t8kbyEcga7zHLM8pcYJrRHnsiF8isDBabybJtOGyhreb3y5DBzrw8lnBWxXkjxEYKHPNCbxGEXVGcLm46/OjfT4ceqHfvUc5TrIs/j669VTPk1Ky+1ZuE6TnDk/e5Hf/+980eIPvR2YImSwC6Q/Z5j6tqg2+MfGbLam/oAkvMR3NSgTgE0vyDSdFiw671a01plQNpUw6A7j9FXVx6jfk+vn+dLPACc= X-MS-TrafficTypeDiagnostic: AS8PR03MB7509: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ym219OYr2iOl2+7VgEaKoDjn3FebsmMA/B+4kUjCZqDoFJyToJPFoN60VElfgogqvB74ZYuIjr+UWEW+BEqPdHruQpPCJt1GzIgDGn70nIJIjE2MZyfvZV0zWC6I+WD6yarxTXrY7+SRn/kpJmg5l5/5tmfTEQRh47lvwLxobU5cX7SKQTV5hcJ/escloB4p1S5JDGNm3RKbM+z2wKx8G4f1QWq0gt6dgsGWfDXMxlGL7QIsePUgIL3m5gGWaRJZIx7dil0VsTjeKEqBiDBJylxd+ceW801oIWDdQuMz7YQLodTstWoZKOF0yQLas8D2rdCgi3/K5ClUnmkrrRH8bILmJW22BbuPFpC9T5j9o+bvsgM+qPRPYksZ0tZU8FY/uDHSAtDuow0OkgJ62QXjEpvsVTaF0Lr9TXsVBu1JMdEJV5gOTfKPjLuBTv+d827c X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DVRSjvJMly60+IwLNtRFR4Qi2GomM/oLQBMHMTnKk3QfWJswVTcP8uDgsW1Hw3ptZtolUD7y58YRJKCIKn5fGSX+0l1fwsGVPLaPFKxadTB1vreGfg0vzkzUGse/siSvW+ojycv0vam/wCTPTRzYgg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ea853da-26ad-4672-b817-08d97b283189 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:44:41.2351 (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 1/4] avfilter/framesync: Separate framesync AVClass and 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: UYtwdUohn18n Will be useful for deduplication. Signed-off-by: Andreas Rheinhardt --- libavfilter/framesync.h | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/libavfilter/framesync.h b/libavfilter/framesync.h index fb85e8aec7..8436aba23b 100644 --- a/libavfilter/framesync.h +++ b/libavfilter/framesync.h @@ -299,25 +299,34 @@ int ff_framesync_dualinput_get_writable(FFFrameSync *fs, AVFrame **f0, AVFrame * const AVClass *ff_framesync_child_class_iterate(void **iter); -#define FRAMESYNC_DEFINE_CLASS(name, context, field) \ -static int name##_framesync_preinit(AVFilterContext *ctx) { \ +#define FRAMESYNC_DEFINE_PURE_CLASS(name, desc, func_prefix, options) \ +static const AVClass name##_class = { \ + .class_name = desc, \ + .item_name = av_default_item_name, \ + .option = options, \ + .version = LIBAVUTIL_VERSION_INT, \ + .category = AV_CLASS_CATEGORY_FILTER, \ + .child_class_iterate = ff_framesync_child_class_iterate, \ + .child_next = func_prefix##_child_next, \ +} + +#define FRAMESYNC_AUXILIARY_FUNCS(func_prefix, context, field) \ +static int func_prefix##_framesync_preinit(AVFilterContext *ctx) { \ context *s = ctx->priv; \ ff_framesync_preinit(&s->field); \ return 0; \ } \ -static void *name##_child_next(void *obj, void *prev) { \ +static void *func_prefix##_child_next(void *obj, void *prev) { \ context *s = obj; \ s->fs.class = ff_framesync_get_class(); /* FIXME */ \ return prev ? NULL : &s->field; \ -} \ -static const AVClass name##_class = { \ - .class_name = #name, \ - .item_name = av_default_item_name, \ - .option = name##_options, \ - .version = LIBAVUTIL_VERSION_INT, \ - .category = AV_CLASS_CATEGORY_FILTER, \ - .child_class_iterate = ff_framesync_child_class_iterate, \ - .child_next = name##_child_next, \ } +#define FRAMESYNC_DEFINE_CLASS_EXT(name, context, field, options) \ +FRAMESYNC_AUXILIARY_FUNCS(name, context, field) \ +FRAMESYNC_DEFINE_PURE_CLASS(name, #name, name, options) + +#define FRAMESYNC_DEFINE_CLASS(name, context, field) \ +FRAMESYNC_DEFINE_CLASS_EXT(name, context, field, name##_options) + #endif /* AVFILTER_FRAMESYNC_H */ From patchwork Sun Sep 19 04:46:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30370 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp394236iob; Sat, 18 Sep 2021 21:47:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypC2OZ0AtMSkWygSsFlgA6HquIUqy/bHT/JUKWIAP+us67hxA3blXmCre3ZyZtFlSr61Tx X-Received: by 2002:a50:f145:: with SMTP id z5mr22248663edl.4.1632026831542; Sat, 18 Sep 2021 21:47:11 -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 ds7si6288366ejc.302.2021.09.18.21.47.11; Sat, 18 Sep 2021 21:47:11 -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=kfzGyMIo; 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 033EE68B1B6; Sun, 19 Sep 2021 07:47:09 +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 72C7868B1BB for ; Sun, 19 Sep 2021 07:47:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PEokVuJHO70yrpMCSFr/yxZQ3V7QWr+BSeqdExVYKtW/A2/S0XcvqsNuV79AkVxB1u5YzN6IfHv7/1MjXP8nyXWRXW9I9pL3NBor0yi/ntreS+pCQLd75o4BkTW0GT/y1M39S/Iakp0hGh2rtiEmh24BHrwIm+rWKGkSnMONrlMSCTnPpYhbr1s7VVSe6f5Q9eHAGyqlwSSMOTmxU6aEIgOi8TbTUZLZGIx+H52myLYdJOOgQ80NQ3Tc+UCKAKJdrFfJSnX+x/bJnAH20rx834M3d/Xayz623mqfKZhV7bQMCSwr8PR1M91IwUHRSlV3wNlY2Jm4I3zUggpPP5B2sw== 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=sEcaiU5cQyUB97+B8tG9Xzf6iwmcqSCk2oqjjFg+HyQ=; b=EM74pWx6MjnuXjjBVbhl46mE2kwrkN4CAbvOlFLuhjBKBSycIHNfgAeVgp4wai929wrvWwbSQsTofAAz5U6voV33GPDeix6FGmLxmk8/j5t9ZfkXJSg8GI12K+bvBFQFqxrIRL12Zq22CxO7bUPTNBs7wy1tBcS/qItQmBq0B2lb3Ct+tR54SyN2NpjSy8WQhd6hxPQet+wXqEsOGg1TieuborQAVA1IAUoG/z/HDE5amii6N8fM42cG9x7fj03SXebgKf71g6219ndlmXPwY1DVz1WwB73PDpUMFCKoYSSIKh/oxyIy4qSOuVqJyxMBXq+8F8wtBaQ+GPmWEopzAA== 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=sEcaiU5cQyUB97+B8tG9Xzf6iwmcqSCk2oqjjFg+HyQ=; b=kfzGyMIo+1U0bOaU33u7VC4fvWnZ17LnkJDA1xqKOukeYDmcKmfmt14SSx3tmqLyv7Xl+/+r57+Wzm3lplXDrtmVUzBpWPymbaDfHyzL1OPnOk6eM7eduZPil/bF5lDsseHM1YiKs+Obox/l0qlTGtDPpTocWD4TJjdP/f6eYCr/hDv0QVrshzWEMh2OGvzmslZp0RYYCZWmZ/QEV6k2WTvYvpuj20gjXM1zr1gZ5iO/izIgUR6rFizz52piuE6ymgghXs3OugPtOtX/MbEH5u+CYe0Jix7aM+ookaa4use4sZsj/rcTlDUtd6RA7zF9qg+298LRqra06ePVLyaGJQ== 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:01 +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:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Sep 2021 06:46:51 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [tRCXksw5ktPxz+zFIevy3BS1ntrMDT60] 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-1-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:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c63a226a-712e-4325-bf17-08d97b2884f0 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3VHo3jlqpVr5BFXTfskQ6AZswtnQD+GlWvxVUfa0dOGrjiy9uzuQExYUG5GpiiiiaTK+HPqumc13H4m+LCl6wumhQxtm7n2IXTyVfee7zliX91bP6pUYam71JB1dnAm5jznxucGW+XnEooF7I448z02uFfITCZfEeXbQWoN2/tY4XgqAVtHHwGf9f+xlhu2r6gt/moaXV9ufS6yXxP3oreoT9hQQzGrGBCAX+Hh//T7fyd8bESR71EBSPPfJkC0YOzc31iVSpumTbWpmriXTeh9oeVP5oJFIZZkeHyELyP1kAQvIe25wbM6O8SRLedUIOeVvgpYtrgbFX0d6AGu2DQ7Lz0FYS1Knpg9PFP04IxeFn1JwoieL+p7ABqwE4QnveukL+sPHZ8VGxLBvILXWpp9HjUunky5SGwETh+ozphy0D78ajPLdCrN4oTDdq2r0umMMWJCrlPAaDGamohj09Y6N2tmd+TIprDVJtE4yPPLlh7fMyWdEYv8+ZhzLOrKnIeEGJXk88KL3zkr5raTJY/AtaSFCnLgJdl1f6Jp2/uh1xEIZu2nEe/mO1WGtxXTV3aIMHUGOAlTE4ujApm6UdvLVPxEgvFo8qrBT9Cz6ntsN/gEIA5Uh4mvnOKKLXCX4CI5k2MTwjZED1eXsP4NBz3XeS+rayFhXAII17IrU7S1dpTo8RWUFbFWp7QnGMgV7LBGf3lTBqp81QciQuietH6ahNwyRAVaXU0= X-MS-TrafficTypeDiagnostic: AS8PR03MB7509: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NUNnMvLUPEn2E0dhxv/GAcGf7FV5OvIqUG1Ncx3uaTO+HRWv0DNjqKgeaAKjGl0/qvtbYGUILpjjjdtl1FESkBDi13cwmEjQIQ2aM/EL7K9b7/mmiicAqnfkLtROdZxSUCDjAZqPn5N+0P94sq+f5txfIoN+YLTca3yXigfkzPA/nbTvOX6mdjIdHY/dEDKo5M9HRI/U8P/aYDpC7P21UqwnCnZ10LRNUrUfTqpYUmp3z7VjJ4lYYNg+82K+xhOKZ5+oIEoySzm53SbfX94sa7koMQnx1dZJBD6XEhGUrg1Qc6MLP08PjsMqIFU6vPha7ipN8cnIwrCU00hnWH0sPZ43gDX61VLMV+NYe1iZ1I0WdsikOl3oFkgiH9kIyv+3hNOE4MtbJCFwTaxriqc9XvwLSQ72bDQb1Afg8fr05WeUM27kSafcIod9oLRZ37Dk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dU22phhA6G3QYF/2dmVDsb47Bkfrdb8SNZegn1TDg1o15wIffmft4znwZJDZhQtgG+aq9pSkFHVVkaUISQcO0AWZLTNDHnUWO4tjUG4cQ4n7vEul4GGYj+yDmGlp6M89NxveVFg0yAwuvVlpB0efDA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c63a226a-712e-4325-bf17-08d97b2884f0 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:01.0975 (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 2/4] avfilter/vf_lut3d: Deduplicate options 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: fX4M6Vcg1my6 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_lut3d.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 111e624dc3..9fbda833b9 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -1261,13 +1261,22 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar return config_input(ctx->inputs[0]); } +#if CONFIG_LUT3D_FILTER || CONFIG_HALDCLUT_FILTER + +/* These options are shared between several filters; + * &lut3d_haldclut_options[COMMON_OPTIONS_OFFSET] must always + * point to the first of the COMMON_OPTIONS. */ +#define COMMON_OPTIONS_OFFSET CONFIG_LUT3D_FILTER +static const AVOption lut3d_haldclut_options[] = { #if CONFIG_LUT3D_FILTER -static const AVOption lut3d_options[] = { { "file", "set 3D LUT file name", OFFSET(file), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS }, +#endif COMMON_OPTIONS }; -AVFILTER_DEFINE_CLASS(lut3d); +#if CONFIG_LUT3D_FILTER + +AVFILTER_DEFINE_CLASS_EXT(lut3d, "lut3d", lut3d_haldclut_options); static av_cold int lut3d_init(AVFilterContext *ctx) { @@ -1588,11 +1597,8 @@ static av_cold void haldclut_uninit(AVFilterContext *ctx) av_freep(&lut3d->lut); } -static const AVOption haldclut_options[] = { - COMMON_OPTIONS -}; - -FRAMESYNC_DEFINE_CLASS(haldclut, LUT3DContext, fs); +FRAMESYNC_DEFINE_CLASS_EXT(haldclut, LUT3DContext, fs, + &lut3d_haldclut_options[COMMON_OPTIONS_OFFSET]); static const AVFilterPad haldclut_inputs[] = { { @@ -1631,6 +1637,8 @@ const AVFilter ff_vf_haldclut = { }; #endif +#endif /* CONFIG_LUT3D_FILTER || CONFIG_HALDCLUT_FILTER */ + #if CONFIG_LUT1D_FILTER enum interp_1d_mode { 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, From patchwork Sun Sep 19 04:46:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30372 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp394368iob; Sat, 18 Sep 2021 21:47:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFwjIDsfXkEY0QwnMfuWqe9y+9wwZKj/UaPuESlAbpBXS0cfbKjETC3odQPk06BjV2bSIJ X-Received: by 2002:a17:906:4c8c:: with SMTP id q12mr21095053eju.254.1632026848509; Sat, 18 Sep 2021 21:47:28 -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 a7si11584767edm.374.2021.09.18.21.47.28; Sat, 18 Sep 2021 21:47:28 -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=stEEWv06; 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 F410368B1D3; Sun, 19 Sep 2021 07:47:18 +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 BD9F468B1C2 for ; Sun, 19 Sep 2021 07:47:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eI1S0E9QinRGHO+5DZDOe57uSBDFjbHafkhNUXi0Cy6PF0ckR0aP697sTTCxD49uZq+aqYD6aeFXibmz1fnk2202HnJxiJNDNnT+Ad7aoGneVwmnu+ESgj+VucmNJeR3juo2cy9wMJ4LNlt8YkFTxkByyqRqWKPR8SCFqUdrXqGWhywTHRoysGK9FLiGddRDCXdiSgzXo1zRyg5WfcdKbwDvv38m60aq3wbaa8TbUbhwWCggdom+yczcmxhJ9M+jfHTkuwze2xy6xmgSQAx/201VrLXljxQ/Od80nU/0l3E0Q4i6vHbn+UNBv0BVIghPD5npMZ6kA2Ur402M4vwqWA== 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=ouJHHw6y3ZmlCOgQ9wdUknqwR1ziBCAjhB9db25J7ZQ=; b=WMxwNDWeoRFa5V8j4dhInGEmVv/YWTig71Dx2CBK3hB0hz3kRKRusMwAnUuI0WJZckM/V/ARpJZ1/VytotmjOTlxK9VvxF3F9Jz926s04aYtegrc3gmlnFRha0MNGkqfRnImECB8HPOlQL1GZAVMyqjhcftztv921lox4Pxg69fSzpG5zVH8MHjdYH5ZMH4H213iiVko3yZZTL03llLjb98OeT3VTy03RaOBUAyRNI9XSjXPIXcp8tPrE/4gF/FHQjW2izO+aUVxl6utn8JceYVyNLdWgd2Qik/IZO0P4/Tfeh5SaZenR7vjKFa+xYUCLoPoTpRPP1AWuNT+gT4ikA== 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=ouJHHw6y3ZmlCOgQ9wdUknqwR1ziBCAjhB9db25J7ZQ=; b=stEEWv060KBWEf3H8rhPZDPN6gejSrGbKSHyFsnG2MYJz/zl32uE1J6Kqf2beohHt7I1SKjNcEMMCojFceTESVdSIjMMc9pL0GmquRhUcGvYQ3CqflEoIzdEHR+xv0SxkKm9MCVX4D7kS2HNmFcsD/j59AmyURznitMEvCXzldv8s9qwYOY3LeXkzddGfoEo62/PjDfTnYNwZckgh2fGrr4/AcsdtkiZfyqqXaIeIpoN7FMKvxJcaWzIBGkTS+z4AUdBjP69hG2tBLmdZm5skR6+4MtofDwIN3OnNuFTVRJDDaXKrlXN7Z8RuppZ9zfgwGdy+7jdjlc8u6j7Dk5YVg== 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:04 +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:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Sep 2021 06:46:53 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [G2XeyB+Q1OBcvPflYRxQsg5ouOTFR6Gn] 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-3-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:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7c375889-61d3-46a2-6867-08d97b288722 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWoRMOa5xb2sQWQKjwT7ylwVFJH8KTnwCgaqPES6pexBL5Bd0PXxo+QxFqyYg9+1g5/rt78+o8f/7dqqVfsi8sVnkBTDex/W7LNmDluj4XTNFL0uXahhWr5CgnPZ4khThDe3BmNGk7t82/ofBkTILzIcPyQOZF3R8hrmiRtSqAfSJ6vF3SGLBRM0ABIQFia1G0NegL3hW5x8Hxbugfzcy8ztxi+Zu1FzJgYNnOEVwt46iVOdKvR8z3jowQcTLMSgIlEtTbkopv6pzNibkJgz7cFJca+A1ptlVpDBMnHclJFcDQMVTOebUX1lpFTITIFcxiU3HubDdD9m14f/+Mv5bq50teNVmatyDWLmRYQVgm1pC0UjiPXO9KWTBXPuCdiEuhqBxuBhsp4JJzM+r1GsZDG85GqvBZUf7m+DUBzFev5UiP5atSnCLLgWHhDvpcGU3/XdjVhlIxB7bufPPoDHHnmLcxbTetNh9Z62xX/RuMEzZYvjsoCW+hl89eAM66kXIekkb9n55DujU6CfIrR9KWYDhS7lvmItP7oqPUS6fYv9Dx/Ep6tjVk+NegftilmGItX1PGxI/tD/EK1CnQDrBe8YLFCECnAVtONn/20GZz8MzBI5xyR7V9dZNEkrKKZnRgtZ2CZMUkf0quQ3FwIVU0gd80A115CDaV8msXe0AkefLVsPTl4Zrll2ZKPBTtMmu2k9iB6kFWqBp53j34ZyjEvYzimS6eIdO4= X-MS-TrafficTypeDiagnostic: AS8PR03MB7509: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wWuRuw9SgLtOWNiPU/XuLe3HJhrn/K9yzhqLzRQFnwbgiS3YOB3AeMhjfkRapi7YowX9yv/4qk3GF+Wx6ggIwT3+dcSK+4x0IgNZguRZeL13y2FCqi7HNsEjws1yiTZcuGlr48AVIL8Cf2NuSqLkczZWXh8kvSkI03v2xJtTRNjJR5n/FRIwRhWvgSpCbrzhtM5UMa8JAQ5azwzGFmMm/QY0ZbNs6o1IHRWWDTPI7h2s7j5wEkUWVVjvf1E5wBwtxEe1VB3biSpwv1yEiXnDsKVSj5flI7YqW9BnyguXOnPqXCrXiZmNXEHkxonA0vwtn6+/8A3CbFZAVZHhaJjOsf6gu4r7t+df2RQjOgikR95lLI8W3hBUu6v23FtNFn8ZiuuJV3KM604v/WqCl/yE7gcQuoV1Dr25NLJvWScjcdeCwmKoru9/NpeNSMEIKCwS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4v3Xkq4BCcwm3ccTmNDjjv+bDLaifgqdZ6UxsmPH2df1xeikocHyfwcsT8pjdQCvRyu9QuL0wxH4cr9oKgbXbkrJOveh04G5WGi0m8QMc7JzftaNJYIs9Av3OSYMJQVFZyAb8h+XHiDw8vTU5so4JA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c375889-61d3-46a2-6867-08d97b288722 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:04.7714 (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 4/4] avfiler/framesync: Remove redundant setting of AVClass 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: jOVDR6y7aE8U Every filter exposing the framesync options via its child_next callback already calls framesync_preinit() in its preinit callback. So the filter is already preinited whenever its child_next is called. Signed-off-by: Andreas Rheinhardt --- libavfilter/framesync.c | 5 ----- libavfilter/framesync.h | 9 +++------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c index bc6fce81f4..7510550d8e 100644 --- a/libavfilter/framesync.c +++ b/libavfilter/framesync.c @@ -68,11 +68,6 @@ enum { static int consume_from_fifos(FFFrameSync *fs); -const AVClass *ff_framesync_get_class(void) -{ - return &framesync_class; -} - void ff_framesync_preinit(FFFrameSync *fs) { if (fs->class) diff --git a/libavfilter/framesync.h b/libavfilter/framesync.h index 8436aba23b..c0a9d3e969 100644 --- a/libavfilter/framesync.h +++ b/libavfilter/framesync.h @@ -208,11 +208,6 @@ typedef struct FFFrameSync { } FFFrameSync; -/** - * Get the class for the framesync object. - */ -const AVClass *ff_framesync_get_class(void); - /** * Pre-initialize a frame sync structure. * @@ -310,6 +305,9 @@ static const AVClass name##_class = { \ .child_next = func_prefix##_child_next, \ } +/* A filter that uses the *_child_next-function from this macro + * is required to initialize the FFFrameSync structure in AVFilter.preinit + * via the *_framesync_preinit function defined alongside it. */ #define FRAMESYNC_AUXILIARY_FUNCS(func_prefix, context, field) \ static int func_prefix##_framesync_preinit(AVFilterContext *ctx) { \ context *s = ctx->priv; \ @@ -318,7 +316,6 @@ static int func_prefix##_framesync_preinit(AVFilterContext *ctx) { \ } \ static void *func_prefix##_child_next(void *obj, void *prev) { \ context *s = obj; \ - s->fs.class = ff_framesync_get_class(); /* FIXME */ \ return prev ? NULL : &s->field; \ }