From patchwork Tue Jan 17 06:20:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 40059 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp1584811pzb; Mon, 16 Jan 2023 22:21:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXtgEYxMOcMeGMYetypqeOa0hUybQ7no6B2y5WQjYNK4McRtcb8+C6UlwkMOxpVZbDkgf5XT X-Received: by 2002:a17:906:aec2:b0:7b2:7a42:3e43 with SMTP id me2-20020a170906aec200b007b27a423e43mr1638177ejb.23.1673936472112; Mon, 16 Jan 2023 22:21:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673936472; cv=none; d=google.com; s=arc-20160816; b=D93g8CxOO8cWoUuBOTRkY9t+Nf6CNupAmCY2xJJtBRZhuc7oJqdVElr6LWGmnLBSZ4 okEo9hq6t6TPEPN3GoKB4uNXBry1e0qSt+DJrQyHRvNJWHL1PCqwuuNHHaGOYkH+u9RC Gw8XJpAdQ2qUcBlhX0tjH+nC1GXSvPgAHG7KInatYZ0koKX6v+LTjfY4oCp9WBCSlh49 k+DocPMT91IjhKFSsoLmmkVP21M4tZiMfsc+mok4O/tFO1SFxV3kSxFFhUdpzq3UwUCr Wt4Vy0tDa6RqOlpHE4aN+slW5mt0g6lopIv0HGZd1+QbZS3ASQEzkxh1O5xCl49mpF2k 2Eqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=O2qhNpth1vA9CO9FqJGmTHQo9laXq4+szxbgBxeIDt0=; b=gFl8m08VLknKTQToAhtI1TiC8LfDQFOJj0cXvboJQSndm22hYB0ra1DOY9k1mN80KI DgNJoAdLbDKn/SAgqXgAeOiQlvsYIZsxngJeHGulrfmzp/90us/TD3ugy7TiyPkbNURT dNDbu1wPVuXD0jv8rr9gPcbhNl5sme1GYD4Pgn5XOVeRDHrZ+/E6XSzea6atMQg/LOQ+ 5sfEQD6AEBmrfLW7hlTOA9CE40NfgvQYhRsdf+YhP/xIVJJUQMhOBQVEG3aCQa+mm1h3 MfB/qZcff+BxK8WhcP6VT5uJJLGoL9FebceReMZWnH7h0AA/XNSBikCFMNIUOC9kHOmb cW5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=kxgWRI1g; 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 jg3-20020a170907970300b007a5cdd9550esi8252526ejc.201.2023.01.16.22.21.11; Mon, 16 Jan 2023 22:21:12 -0800 (PST) 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=@intel.com header.s=Intel header.b=kxgWRI1g; 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 F0F9568BC6C; Tue, 17 Jan 2023 08:20:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1728968BE1C for ; Tue, 17 Jan 2023 08:20:44 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673936450; x=1705472450; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=IuGNhZdOQ9Mm1Zv5AxeUwvwmcRQAqPhQVS/X8XKLLTY=; b=kxgWRI1gWret/6nbz0AnQeQqq4dZ52SrzgcahyrYuHASY6zWN1OyOE1r CYJvlH7g76gJWnhsRI/wAOeEpBFyxHufniEAImzLxnFLX0cLL1+LpRbO3 ZU/se478qewE9e5I3YphxVIl7SXYQjmJPjHgCzJBmkXQwL+QmLPXLgEQK NVgw/lR06KAgmOEMhxW/FjvuF0tqTN1nMrpy6O8Xn12W/m78BQFi7KENs A283V2TjUvqFuujfdmUmFn6bZ/Eu0RgST3+q1AyuZqiJbGtAw+rxjhUn9 jIalQ2oJ8lGHcMfWqPrbrtu5Dhh53U2uLqQ9BcElOD4YkJ8n8HEmkzgBp w==; X-IronPort-AV: E=McAfee;i="6500,9779,10592"; a="351866262" X-IronPort-AV: E=Sophos;i="5.97,222,1669104000"; d="scan'208";a="351866262" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2023 22:20:38 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10592"; a="691480628" X-IronPort-AV: E=Sophos;i="5.97,222,1669104000"; d="scan'208";a="691480628" Received: from xhh-dg164.sh.intel.com ([10.238.5.169]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2023 22:20:37 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Jan 2023 14:20:27 +0800 Message-Id: <20230117062027.28073-3-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230117062027.28073-1-haihao.xiang@intel.com> References: <20230117062027.28073-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH 3/3] lavfi/vpp_qsv: factor common QSV filter definition 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: Haihao Xiang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ljq2p0TeRcz3 From: Haihao Xiang Signed-off-by: Haihao Xiang --- libavfilter/vf_vpp_qsv.c | 126 ++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 75 deletions(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 34732bb2c9..34e530e244 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -615,36 +615,31 @@ static const AVFilterPad vpp_outputs[] = { }, }; -#if CONFIG_VPP_QSV_FILTER - -static int query_formats(AVFilterContext *ctx) -{ - int ret; - static const enum AVPixelFormat in_pix_fmts[] = { - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NV12, - AV_PIX_FMT_YUYV422, - AV_PIX_FMT_RGB32, - AV_PIX_FMT_P010, - AV_PIX_FMT_QSV, - AV_PIX_FMT_NONE - }; - static const enum AVPixelFormat out_pix_fmts[] = { - AV_PIX_FMT_NV12, - AV_PIX_FMT_P010, - AV_PIX_FMT_QSV, - AV_PIX_FMT_NONE - }; +#define DEFINE_QSV_FILTER(x, sn, ln, fmts) \ +static const AVClass x##_class = { \ + .class_name = #sn "_qsv", \ + .item_name = av_default_item_name, \ + .option = x##_options, \ + .version = LIBAVUTIL_VERSION_INT, \ +}; \ +const AVFilter ff_vf_##sn##_qsv = { \ + .name = #sn "_qsv", \ + .description = NULL_IF_CONFIG_SMALL("Quick Sync Video " #ln), \ + .preinit = x##_preinit, \ + .init = vpp_init, \ + .uninit = vpp_uninit, \ + .priv_size = sizeof(VPPContext), \ + .priv_class = &x##_class, \ + FILTER_INPUTS(vpp_inputs), \ + FILTER_OUTPUTS(vpp_outputs), \ + fmts, \ + .activate = activate, \ + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, \ +}; - ret = ff_formats_ref(ff_make_format_list(in_pix_fmts), - &ctx->inputs[0]->outcfg.formats); - if (ret < 0) - return ret; - return ff_formats_ref(ff_make_format_list(out_pix_fmts), - &ctx->outputs[0]->incfg.formats); -} +#if CONFIG_VPP_QSV_FILTER -static const AVOption options[] = { +static const AVOption vpp_options[] = { { "deinterlace", "deinterlace mode: 0=off, 1=bob, 2=advanced", OFFSET(deinterlace), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, MFX_DEINTERLACING_ADVANCED, .flags = FLAGS, "deinterlace" }, { "bob", "Bob deinterlace mode.", 0, AV_OPT_TYPE_CONST, { .i64 = MFX_DEINTERLACING_BOB }, .flags = FLAGS, "deinterlace" }, { "advanced", "Advanced deinterlace mode. ", 0, AV_OPT_TYPE_CONST, { .i64 = MFX_DEINTERLACING_ADVANCED }, .flags = FLAGS, "deinterlace" }, @@ -686,27 +681,34 @@ static const AVOption options[] = { { NULL } }; -static const AVClass vpp_class = { - .class_name = "vpp_qsv", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; +static int vpp_query_formats(AVFilterContext *ctx) +{ + int ret; + static const enum AVPixelFormat in_pix_fmts[] = { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NV12, + AV_PIX_FMT_YUYV422, + AV_PIX_FMT_RGB32, + AV_PIX_FMT_P010, + AV_PIX_FMT_QSV, + AV_PIX_FMT_NONE + }; + static const enum AVPixelFormat out_pix_fmts[] = { + AV_PIX_FMT_NV12, + AV_PIX_FMT_P010, + AV_PIX_FMT_QSV, + AV_PIX_FMT_NONE + }; -const AVFilter ff_vf_vpp_qsv = { - .name = "vpp_qsv", - .description = NULL_IF_CONFIG_SMALL("Quick Sync Video VPP."), - .priv_size = sizeof(VPPContext), - .preinit = vpp_preinit, - .init = vpp_init, - .uninit = vpp_uninit, - FILTER_INPUTS(vpp_inputs), - FILTER_OUTPUTS(vpp_outputs), - FILTER_QUERY_FUNC(query_formats), - .activate = activate, - .priv_class = &vpp_class, - .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, -}; + ret = ff_formats_ref(ff_make_format_list(in_pix_fmts), + &ctx->inputs[0]->outcfg.formats); + if (ret < 0) + return ret; + return ff_formats_ref(ff_make_format_list(out_pix_fmts), + &ctx->outputs[0]->incfg.formats); +} + +DEFINE_QSV_FILTER(vpp, vpp, "VPP", FILTER_QUERY_FUNC(vpp_query_formats)); #endif @@ -734,32 +736,6 @@ static av_cold int qsvscale_preinit(AVFilterContext *ctx) return 0; } -static const AVClass qsvscale_class = { - .class_name = "scale_qsv", - .item_name = av_default_item_name, - .option = qsvscale_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -const AVFilter ff_vf_scale_qsv = { - .name = "scale_qsv", - .description = NULL_IF_CONFIG_SMALL("Quick Sync Video scaling and format conversion"), - - .preinit = qsvscale_preinit, - .init = vpp_init, - .uninit = vpp_uninit, - - .priv_size = sizeof(VPPContext), - .priv_class = &qsvscale_class, - - FILTER_INPUTS(vpp_inputs), - FILTER_OUTPUTS(vpp_outputs), - - FILTER_SINGLE_PIXFMT(AV_PIX_FMT_QSV), - - .activate = activate, - - .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, -}; +DEFINE_QSV_FILTER(qsvscale, scale, "scaling and format conversion", FILTER_SINGLE_PIXFMT(AV_PIX_FMT_QSV)); #endif