From patchwork Fri Nov 19 14:50:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 31500 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp2494034iob; Fri, 19 Nov 2021 06:50:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJyo+GJTl3Qr8+rFGaMOPJ+X3DnAsjA25zBcI4v+TGLY730PWr69R2pZRNjrYtVjHwRZ5skE X-Received: by 2002:a05:6402:90c:: with SMTP id g12mr24870356edz.36.1637333431718; Fri, 19 Nov 2021 06:50:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637333431; cv=none; d=google.com; s=arc-20160816; b=xOS7lvv1ydZsyfen8sqORGEa9St/XIpT4d7hGcDq29TR1utxuab6JW0QX2XhLzDM9i mQrIMR3nUj/y2YjzrKbTuXbunxL4WWS1jfRMESUUBhLBl6n/lWTyrUVBTLBiZeR2iEiT Y1sfgMc943zMQPbgezjVPBsoGReFGttnmfoWSn4rRa/crcrRN0gOL1pJozAxsJT0A3rp CL/9ZaYV0nhjQM30K31UxIEip11bIEj1iT54zMFz1E9rTT3RGS9t5OqzNFU6LXyVQPvM jNJsyvE0DvfRuznktL+Kt88V0rnoMdt8HsQvLHpbunnimvBZUgfYrsC7HUcTKOP/u9bR oJ7g== 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:delivered-to; bh=W+TNLGeAaDgBdErIRSyPqLCPpwcfZBCvBsKkPdQ8m7w=; b=KnGpd19coYP11csulDCRajGgO5k3tAjssoPbfAzY5BEdMl4S+kPdqq1yY4Os40LjL7 kCELXJRm12Kf97VFBso6SdRMNanO8RMniKhFQxokS6UcsJ+t/oTbxcrFLnVU/4yhDQT0 rzO4RRKsvExqdCZM2GoyTFNaCNGQLLIPdSy3m+gB6W0i62iuifO+SI4a9IJakVNrL38z Pts0+PNTS0xfXCR8YhuVBn8Iq3pSJRqilMUs77gwfYC+pVSlAiQAiUJ6ASVYTxN5znE5 GFlMnVzbnzBXq9fNcwbWRAYO1mOPZPrjNkP2gOFJmPocPbdzbddv4xLBF10NR9iAzQ0L Sv3Q== ARC-Authentication-Results: i=1; mx.google.com; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cw2si10456274ejc.730.2021.11.19.06.50.31; Fri, 19 Nov 2021 06:50:31 -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; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5462E68AB35; Fri, 19 Nov 2021 16:50:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8EE368A973 for ; Fri, 19 Nov 2021 16:50:10 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10172"; a="221302416" X-IronPort-AV: E=Sophos;i="5.87,248,1631602800"; d="scan'208";a="221302416" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Nov 2021 06:50:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,248,1631602800"; d="scan'208";a="673232495" Received: from otc-skl-e5-server.sh.intel.com ([10.239.43.106]) by orsmga005.jf.intel.com with ESMTP; 19 Nov 2021 06:50:07 -0800 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Nov 2021 22:50:01 +0800 Message-Id: <20211119145001.15829-2-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211119145001.15829-1-jianhua.wu@intel.com> References: <20211119145001.15829-1-jianhua.wu@intel.com> Subject: [FFmpeg-devel] [PATCH v2 2/2] avfilter: add a vflip_vulkan filter 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: Wu Jianhua MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cpPzwvg1FPIM The following command is on how to apply vflip_vulkan filter: ffmpeg -init_hw_device vulkan -i input.264 -vf hwupload=extra_hw_frames=16,vflip_vulkan,hwdownload,format=yuv420p output.264 Signed-off-by: Wu Jianhua --- configure | 1 + libavfilter/Makefile | 3 +- libavfilter/allfilters.c | 1 + .../{vf_hflip_vulkan.c => vf_flip_vulkan.c} | 106 +++++++++++++----- 4 files changed, 84 insertions(+), 27 deletions(-) rename libavfilter/{vf_hflip_vulkan.c => vf_flip_vulkan.c} (76%) diff --git a/configure b/configure index 39c59fb118..e0734aed0d 100755 --- a/configure +++ b/configure @@ -3695,6 +3695,7 @@ transpose_vaapi_filter_deps="vaapi VAProcPipelineCaps_rotation_flags" unsharp_opencl_filter_deps="opencl" uspp_filter_deps="gpl avcodec" vaguedenoiser_filter_deps="gpl" +vflip_vulkan_filter_deps="vulkan libglslang" vidstabdetect_filter_deps="libvidstab" vidstabtransform_filter_deps="libvidstab" libvmaf_filter_deps="libvmaf pthreads" diff --git a/libavfilter/Makefile b/libavfilter/Makefile index ac31ae42fa..651a2a9e93 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -298,7 +298,7 @@ OBJS-$(CONFIG_GREYEDGE_FILTER) += vf_colorconstancy.o OBJS-$(CONFIG_GUIDED_FILTER) += vf_guided.o OBJS-$(CONFIG_HALDCLUT_FILTER) += vf_lut3d.o framesync.o OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o -OBJS-$(CONFIG_HFLIP_VULKAN_FILTER) += vf_hflip_vulkan.o vulkan.o +OBJS-$(CONFIG_HFLIP_VULKAN_FILTER) += vf_flip_vulkan.o vulkan.o OBJS-$(CONFIG_HISTEQ_FILTER) += vf_histeq.o OBJS-$(CONFIG_HISTOGRAM_FILTER) += vf_histogram.o OBJS-$(CONFIG_HQDN3D_FILTER) += vf_hqdn3d.o @@ -493,6 +493,7 @@ OBJS-$(CONFIG_VAGUEDENOISER_FILTER) += vf_vaguedenoiser.o OBJS-$(CONFIG_VARBLUR_FILTER) += vf_varblur.o framesync.o OBJS-$(CONFIG_VECTORSCOPE_FILTER) += vf_vectorscope.o OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o +OBJS-$(CONFIG_VFLIP_VULKAN_FILTER) += vf_flip_vulkan.o vulkan.o OBJS-$(CONFIG_VFRDET_FILTER) += vf_vfrdet.o OBJS-$(CONFIG_VIBRANCE_FILTER) += vf_vibrance.o OBJS-$(CONFIG_VIDSTABDETECT_FILTER) += vidstabutils.o vf_vidstabdetect.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 82c50cba49..4bf17ef292 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -470,6 +470,7 @@ extern const AVFilter ff_vf_vaguedenoiser; extern const AVFilter ff_vf_varblur; extern const AVFilter ff_vf_vectorscope; extern const AVFilter ff_vf_vflip; +extern const AVFilter ff_vf_vflip_vulkan; extern const AVFilter ff_vf_vfrdet; extern const AVFilter ff_vf_vibrance; extern const AVFilter ff_vf_vidstabdetect; diff --git a/libavfilter/vf_hflip_vulkan.c b/libavfilter/vf_flip_vulkan.c similarity index 76% rename from libavfilter/vf_hflip_vulkan.c rename to libavfilter/vf_flip_vulkan.c index fe1e8418ed..34ca1d5655 100644 --- a/libavfilter/vf_hflip_vulkan.c +++ b/libavfilter/vf_flip_vulkan.c @@ -24,7 +24,12 @@ #define CGS 32 -typedef struct HFlipVulkanContext { +enum FlipType { + FLIP_VERTICAL, + FLIP_HORIZONTAL +}; + +typedef struct FlipVulkanContext { FFVulkanContext vkctx; FFVkQueueFamilyCtx qf; FFVkExecContext *exec; @@ -34,13 +39,13 @@ typedef struct HFlipVulkanContext { VkDescriptorImageInfo output_images[3]; int initialized; -} HFlipVulkanContext; +} FlipVulkanContext; -static av_cold int init_filter(AVFilterContext *avctx, AVFrame *in) +static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in, enum FlipType type) { int err = 0; FFVkSPIRVShader *shd; - HFlipVulkanContext *s = avctx->priv; + FlipVulkanContext *s = ctx->priv; FFVulkanContext *vkctx = &s->vkctx; const int planes = av_pix_fmt_count_planes(s->vkctx.output_format); @@ -76,26 +81,37 @@ static av_cold int init_filter(AVFilterContext *avctx, AVFrame *in) if (!s->pl) return AVERROR(ENOMEM); - shd = ff_vk_init_shader(s->pl, "hflip_compute", image_descs[0].stages); + shd = ff_vk_init_shader(s->pl, "flip_compute", image_descs[0].stages); if (!shd) return AVERROR(ENOMEM); ff_vk_set_compute_shader_sizes(shd, (int [3]){ CGS, 1, 1 }); RET(ff_vk_add_descriptor_set(vkctx, s->pl, shd, image_descs, FF_ARRAY_ELEMS(image_descs), 0)); - GLSLC(0, void main() ); - GLSLC(0, { ); - GLSLC(1, ivec2 size; ); - GLSLC(1, const ivec2 pos = ivec2(gl_GlobalInvocationID.xy); ); + GLSLC(0, void main() ); + GLSLC(0, { ); + GLSLC(1, ivec2 size; ); + GLSLC(1, const ivec2 pos = ivec2(gl_GlobalInvocationID.xy); ); for (int i = 0; i < planes; i++) { - GLSLC(0, ); - GLSLF(1, size = imageSize(output_image[%i]); ,i); - GLSLC(1, if (IS_WITHIN(pos, size)) { ); - GLSLF(2, vec4 res = texture(input_image[%i], ivec2(size.x - pos.x, pos.y)); ,i); - GLSLF(2, imageStore(output_image[%i], pos, res); ,i); - GLSLC(1, } ); + GLSLC(0, ); + GLSLF(1, size = imageSize(output_image[%i]); ,i); + GLSLC(1, if (IS_WITHIN(pos, size)) { ); + switch (type) + { + case FLIP_HORIZONTAL: + GLSLF(2, vec4 res = texture(input_image[%i], ivec2(size.x - pos.x, pos.y)); ,i); + break; + case FLIP_VERTICAL: + GLSLF(2, vec4 res = texture(input_image[%i], ivec2(pos.x, size.y - pos.y)); ,i); + break; + default: + GLSLF(2, vec4 res = texture(input_image[%i], pos); ,i); + break; + } + GLSLF(2, imageStore(output_image[%i], pos, res); ,i); + GLSLC(1, } ); } - GLSLC(0, } ); + GLSLC(0, } ); RET(ff_vk_compile_shader(vkctx, shd, "main")); RET(ff_vk_init_pipeline_layout(vkctx, s->pl)); @@ -109,9 +125,9 @@ fail: return err; } -static av_cold void hflip_vulkan_uninit(AVFilterContext *avctx) +static av_cold void flip_vulkan_uninit(AVFilterContext *avctx) { - HFlipVulkanContext *s = avctx->priv; + FlipVulkanContext *s = avctx->priv; ff_vk_uninit(&s->vkctx); s->initialized = 0; @@ -121,7 +137,7 @@ static int process_frames(AVFilterContext *avctx, AVFrame *outframe, AVFrame *in { int err = 0; VkCommandBuffer cmd_buf; - HFlipVulkanContext *s = avctx->priv; + FlipVulkanContext *s = avctx->priv; FFVulkanContext *vkctx = &s->vkctx; FFVulkanFunctions *vk = &s->vkctx.vkfn; AVVkFrame *in = (AVVkFrame *)inframe->data[0]; @@ -210,12 +226,12 @@ fail: return err; } -static int hflip_vulkan_filter_frame(AVFilterLink *link, AVFrame *in) +static int flip_vulkan_filter_frame(AVFilterLink *link, AVFrame *in, enum FlipType type) { int err; AVFrame *out = NULL; AVFilterContext *ctx = link->dst; - HFlipVulkanContext *s = ctx->priv; + FlipVulkanContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; out = ff_get_video_buffer(outlink, outlink->w, outlink->h); @@ -225,7 +241,7 @@ static int hflip_vulkan_filter_frame(AVFilterLink *link, AVFrame *in) } if (!s->initialized) - RET(init_filter(ctx, in)); + RET(init_filter(ctx, in, type)); RET(process_frames(ctx, out, in)); @@ -241,6 +257,16 @@ fail: return err; } +static int hflip_vulkan_filter_frame(AVFilterLink *link, AVFrame *in) +{ + return flip_vulkan_filter_frame(link, in, FLIP_HORIZONTAL); +} + +static int vflip_vulkan_filter_frame(AVFilterLink *link, AVFrame *in) +{ + return flip_vulkan_filter_frame(link, in, FLIP_VERTICAL); +} + static const AVOption hflip_vulkan_options[] = { { NULL }, }; @@ -256,7 +282,7 @@ static const AVFilterPad hflip_vulkan_inputs[] = { } }; -static const AVFilterPad hflip_vulkan_outputs[] = { +static const AVFilterPad flip_vulkan_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, @@ -267,12 +293,40 @@ static const AVFilterPad hflip_vulkan_outputs[] = { const AVFilter ff_vf_hflip_vulkan = { .name = "hflip_vulkan", .description = NULL_IF_CONFIG_SMALL("Horizontally flip the input video in Vulkan"), - .priv_size = sizeof(HFlipVulkanContext), + .priv_size = sizeof(FlipVulkanContext), .init = &ff_vk_filter_init, - .uninit = &hflip_vulkan_uninit, + .uninit = &flip_vulkan_uninit, FILTER_INPUTS(hflip_vulkan_inputs), - FILTER_OUTPUTS(hflip_vulkan_outputs), + FILTER_OUTPUTS(flip_vulkan_outputs), FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VULKAN), .priv_class = &hflip_vulkan_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; + +static const AVOption vflip_vulkan_options[] = { + { NULL }, +}; + +AVFILTER_DEFINE_CLASS(vflip_vulkan); + +static const AVFilterPad vflip_vulkan_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = &vflip_vulkan_filter_frame, + .config_props = &ff_vk_filter_config_input, + } +}; + +const AVFilter ff_vf_vflip_vulkan = { + .name = "vflip_vulkan", + .description = NULL_IF_CONFIG_SMALL("Vertically flip the input video in Vulkan"), + .priv_size = sizeof(FlipVulkanContext), + .init = &ff_vk_filter_init, + .uninit = &flip_vulkan_uninit, + FILTER_INPUTS(vflip_vulkan_inputs), + FILTER_OUTPUTS(flip_vulkan_outputs), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VULKAN), + .priv_class = &vflip_vulkan_class, + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, +};