From patchwork Thu Nov 18 04:18:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 31470 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp228331iob; Wed, 17 Nov 2021 20:19:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJzJ948kqFCMr52w6JDqYZHgnNjDAIgPyvnuFjiusDjO2OdgMlTSshzCXtYRMPOmWkXm9cAb X-Received: by 2002:a17:906:4904:: with SMTP id b4mr28338148ejq.174.1637209155073; Wed, 17 Nov 2021 20:19:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637209155; cv=none; d=google.com; s=arc-20160816; b=J2AD1X4zp2HTmvwxmAv5pXlXixpYaXR76tJP/h6omeAULFviSOfBFF0fojg561JzqS 1ZFAaFi1TjfBHu3ntBxJ7kirVdMuCuyyS4webJWqF7x+8aeecqjJDcdtu1iZo3D34yJY FYTdN96iRJBD61QbtgAfI6ycr43LhKRppXlqNdA6O7a9VQ6nbBAo5YWLVTfTNxp/YS0+ idokibnlcJ1Z7rhPEdDlz9f+JYzXGqKGceqWnZZGRWIxZgXq3DtFASkhLqZAfRL0iVGL pAkCG3Fk2qNiYP16H6lcARbyqQ7OOex612k9hMTo8FVVJbOqf/SDHLlOSV7uquDt0x7t v4Ig== 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:message-id:date:to:from:delivered-to; bh=XoWYcaL5b+1fkr56uLAdgstu93snbouGzsUwJN22i/8=; b=YRXy4GV8kUA2ZYyAGWMKAF3G0x6LgzwOxVApGcDS+RatQw15HjyLnoR5FUbi396vWx B2SsaqGnflDdukaMjhfg4Bzoxzza0eLkuxTgCPEd9B/ceGi0k9UUcNqGl30u1fFtxf9D NLpYOWh7uW+/i04gbympmZqeC81MzYjU4DYXRgUPsyyOS5pHsWJvhG0SK8klpEMRps7g gYPNAoyJxKptcUGLLJdt9VNC43t/TGG3qRYz+Wxc56X6coqOHBhWlI8ryvm5gj6u1lIn nZ1D2czLa9l05g+inv2jT0QOk4ao7lTCs2CfE2k7DDU2zc44H2zPfEvOPe9xGzUD8+UU 7spA== 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 ay18si3808792ejb.194.2021.11.17.20.19.08; Wed, 17 Nov 2021 20:19:15 -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 EA1AC68AE33; Thu, 18 Nov 2021 06:19:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DEB71680243 for ; Thu, 18 Nov 2021 06:18:56 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10171"; a="297530456" X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="297530456" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2021 20:18:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="672656712" Received: from otc-skl-e5-server.sh.intel.com ([10.239.43.106]) by orsmga005.jf.intel.com with ESMTP; 17 Nov 2021 20:18:53 -0800 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Nov 2021 12:18:49 +0800 Message-Id: <20211118041850.7597-1-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2 1/2] avfilter: add a hflip_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: /KgC9j6sDM9A The following command is on how to apply hflip_vulkan filter: ffmpeg -init_hw_device vulkan -i input.264 -vf hwupload=extra_hw_frames=16,hflip_vulkan,hwdownload,format=yuv420p output.264 Signed-off-by: Wu Jianhua --- configure | 1 + libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/vf_hflip_vulkan.c | 276 ++++++++++++++++++++++++++++++++++ 4 files changed, 279 insertions(+) create mode 100644 libavfilter/vf_hflip_vulkan.c diff --git a/configure b/configure index 1b47f6512d..f1551063d0 100755 --- a/configure +++ b/configure @@ -3614,6 +3614,7 @@ frei0r_filter_deps="frei0r" frei0r_src_filter_deps="frei0r" fspp_filter_deps="gpl" gblur_vulkan_filter_deps="vulkan libglslang" +hflip_vulkan_filter_deps="vulkan libglslang" histeq_filter_deps="gpl" hqdn3d_filter_deps="gpl" interlace_filter_deps="gpl" diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 07b4a639ec..31d922f75c 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -298,6 +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_HISTEQ_FILTER) += vf_histeq.o OBJS-$(CONFIG_HISTOGRAM_FILTER) += vf_histogram.o OBJS-$(CONFIG_HQDN3D_FILTER) += vf_hqdn3d.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 29da7ef0d2..82c50cba49 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -283,6 +283,7 @@ extern const AVFilter ff_vf_greyedge; extern const AVFilter ff_vf_guided; extern const AVFilter ff_vf_haldclut; extern const AVFilter ff_vf_hflip; +extern const AVFilter ff_vf_hflip_vulkan; extern const AVFilter ff_vf_histeq; extern const AVFilter ff_vf_histogram; extern const AVFilter ff_vf_hqdn3d; diff --git a/libavfilter/vf_hflip_vulkan.c b/libavfilter/vf_hflip_vulkan.c new file mode 100644 index 0000000000..9d164199fe --- /dev/null +++ b/libavfilter/vf_hflip_vulkan.c @@ -0,0 +1,276 @@ +/* + * copyright (c) 2021 Wu Jianhua + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/random_seed.h" +#include "libavutil/opt.h" +#include "vulkan.h" +#include "internal.h" + +#define CGS 32 + +typedef struct HFlipVulkanContext { + FFVulkanContext vkctx; + FFVkQueueFamilyCtx qf; + FFVkExecContext *exec; + FFVulkanPipeline *pl; + + VkDescriptorImageInfo input_images[3]; + VkDescriptorImageInfo output_images[3]; + + int initialized; +} HFlipVulkanContext; + +static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in) +{ + int err = 0; + FFSPIRVShader *shd; + HFlipVulkanContext *s = ctx->priv; + const int planes = av_pix_fmt_count_planes(s->vkctx.output_format); + + FFVulkanDescriptorSetBinding image_descs[] = { + { + .name = "input_image", + .type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, + .dimensions = 2, + .elems = planes, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, + .updater = s->input_images, + }, + { + .name = "output_image", + .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, + .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format), + .mem_quali = "writeonly", + .dimensions = 2, + .elems = planes, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, + .updater = s->output_images, + }, + }; + + image_descs[0].sampler = ff_vk_init_sampler(ctx, 1, VK_FILTER_LINEAR); + if (!image_descs[0].sampler) + return AVERROR_EXTERNAL; + + ff_vk_qf_init(ctx, &s->qf, VK_QUEUE_COMPUTE_BIT, 0); + + { + s->pl = ff_vk_create_pipeline(ctx, &s->qf); + if (!s->pl) + return AVERROR(ENOMEM); + + shd = ff_vk_init_shader(ctx, s->pl, "hflip_compute", image_descs[0].stages); + if (!shd) + return AVERROR(ENOMEM); + + ff_vk_set_compute_shader_sizes(ctx, shd, (int [3]){ CGS, 1, 1 }); + RET(ff_vk_add_descriptor_set(ctx, 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); ); + 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, } ); + + RET(ff_vk_compile_shader(ctx, shd, "main")); + RET(ff_vk_init_pipeline_layout(ctx, s->pl)); + RET(ff_vk_init_compute_pipeline(ctx, s->pl)); + } + + RET(ff_vk_create_exec_ctx(ctx, &s->exec, &s->qf)); + s->initialized = 1; + +fail: + return err; +} + +static av_cold void hflip_vulkan_uninit(AVFilterContext *avctx) +{ + HFlipVulkanContext *s = avctx->priv; + ff_vk_filter_uninit(avctx); + + s->initialized = 0; +} + +static int process_frames(AVFilterContext *avctx, AVFrame *outframe, AVFrame *inframe) +{ + int err = 0; + VkCommandBuffer cmd_buf; + HFlipVulkanContext *s = avctx->priv; + FFVulkanFunctions *vk = &s->vkctx.vkfn; + AVVkFrame *in = (AVVkFrame *)inframe->data[0]; + AVVkFrame *out = (AVVkFrame *)outframe->data[0]; + const int planes = av_pix_fmt_count_planes(s->vkctx.output_format); + const VkFormat *input_formats = av_vkfmt_from_pixfmt(s->vkctx.input_format); + const VkFormat *output_formats = av_vkfmt_from_pixfmt(s->vkctx.output_format); + + ff_vk_start_exec_recording(avctx, s->exec); + cmd_buf = ff_vk_get_exec_buf(avctx, s->exec); + + for (int i = 0; i < planes; i++) { + RET(ff_vk_create_imageview(avctx, s->exec, &s->input_images[i].imageView, + in->img[i], + input_formats[i], + ff_comp_identity_map)); + + RET(ff_vk_create_imageview(avctx, s->exec, &s->output_images[i].imageView, + out->img[i], + output_formats[i], + ff_comp_identity_map)); + + s->input_images[i].imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + s->output_images[i].imageLayout = VK_IMAGE_LAYOUT_GENERAL; + } + + ff_vk_update_descriptor_set(avctx, s->pl, 0); + + for (int i = 0; i < planes; i++) { + VkImageMemoryBarrier barriers[] = { + { + .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, + .srcAccessMask = 0, + .dstAccessMask = VK_ACCESS_SHADER_READ_BIT, + .oldLayout = in->layout[i], + .newLayout = s->input_images[i].imageLayout, + .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .image = in->img[i], + .subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, + .subresourceRange.levelCount = 1, + .subresourceRange.layerCount = 1, + }, + { + .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, + .srcAccessMask = 0, + .dstAccessMask = VK_ACCESS_SHADER_WRITE_BIT, + .oldLayout = out->layout[i], + .newLayout = s->output_images[i].imageLayout, + .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .image = out->img[i], + .subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, + .subresourceRange.levelCount = 1, + .subresourceRange.layerCount = 1, + }, + }; + + vk->CmdPipelineBarrier(cmd_buf, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, + VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0, + 0, NULL, 0, NULL, FF_ARRAY_ELEMS(barriers), barriers); + + in->layout[i] = barriers[0].newLayout; + in->access[i] = barriers[0].dstAccessMask; + + out->layout[i] = barriers[1].newLayout; + out->access[i] = barriers[1].dstAccessMask; + } + + ff_vk_bind_pipeline_exec(avctx, s->exec, s->pl); + vk->CmdDispatch(cmd_buf, FFALIGN(s->vkctx.output_width, CGS)/CGS, + s->vkctx.output_height, 1); + + ff_vk_add_exec_dep(avctx, s->exec, inframe, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT); + ff_vk_add_exec_dep(avctx, s->exec, outframe, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT); + + err = ff_vk_submit_exec_queue(avctx, s->exec); + if (err) + return err; + + ff_vk_qf_rotate(&s->qf); + + return 0; +fail: + ff_vk_discard_exec_deps(avctx, s->exec); + return err; +} + +static int hflip_vulkan_filter_frame(AVFilterLink *link, AVFrame *in) +{ + int err; + AVFrame *out = NULL; + AVFilterContext *ctx = link->dst; + HFlipVulkanContext *s = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; + + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) { + err = AVERROR(ENOMEM); + goto fail; + } + + if (!s->initialized) + RET(init_filter(ctx, in)); + + RET(process_frames(ctx, out, in)); + + RET(av_frame_copy_props(out, in)); + + av_frame_free(&in); + + return ff_filter_frame(outlink, out); + +fail: + av_frame_free(&in); + av_frame_free(&out); + return err; +} + +static const AVOption hflip_vulkan_options[] = { + { NULL }, +}; + +AVFILTER_DEFINE_CLASS(hflip_vulkan); + +static const AVFilterPad hflip_vulkan_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = &hflip_vulkan_filter_frame, + .config_props = &ff_vk_filter_config_input, + } +}; + +static const AVFilterPad hflip_vulkan_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = &ff_vk_filter_config_output, + } +}; + +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), + .init = &ff_vk_filter_init, + .uninit = &hflip_vulkan_uninit, + FILTER_INPUTS(hflip_vulkan_inputs), + FILTER_OUTPUTS(hflip_vulkan_outputs), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VULKAN), + .priv_class = &hflip_vulkan_class, + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, +}; From patchwork Thu Nov 18 04:18:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 31469 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp228404iob; Wed, 17 Nov 2021 20:19:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJywA560vaQexSo0ccH8n02PjBzNgsQkcxISd+j7NhZVRbb+82bin4zbd71OG8jpk6FuAu0i X-Received: by 2002:a17:907:6eaa:: with SMTP id sh42mr28414420ejc.556.1637209159885; Wed, 17 Nov 2021 20:19:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637209159; cv=none; d=google.com; s=arc-20160816; b=w1WjnQqA7iv9QuuSrT4gpCVchOx+o6X/MaBD3jrs6GX1lG7Bwlypm9WzpSM9wG8DEq Mf6cjVfXKEs4gvWYsP8IUd55/LZOE1LxrQZ4vEmEbRbIEwPqUJg4f+sKlDyziinjRMVV Il11YooqmQXdoKwy6/QoZbN7vmDBY0dhQffZYV6Mc13w8fYoE/sR0/TRx7vfVQRg8qd9 CosvhmJnvPdlDo3+T/atPMOaTHXB+DUB4m6Y3PzfkpI9ZcKP3HOv9h7DE/+cAeQwU1bW qoLVc+hCfH8JHSIo/gM5kEICqQFUtp+hkvkMljNINYVaxV7s/7zj5hmDVTWyPsziR4kQ sFJA== 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=bGvYzA6qApui3t5VJRsOtmjjefAdgf0+bjcMW0a1AyI=; b=OqLPemuEr41QlwcI4yV+PEXeV8az/7ce+80iomb+mve3hrPT3ReILzZcp1j+3gJink 0lSfLmro7FRtp3gG/Iq7o+e4E63iAFt0/hBUq8oB6yn1m/JYS5SpHDq+gS59DY/92beF BkgFGoGWcJIZKNmlcnYqsXyQF+KSAEbARRlzmdv6rBMCN/3+1+oErfaXC29m0HHwayvN y8T6syQRJ8xqmQKIWpTqEclZSxBmGJ3XtwkCvRQpo4lzxYT0F1vtr9Ep2uNOX1JGSLgO VdUv3q/tMyIt/7wM49gxUgxC4/Estzo8N0/bmogFzTowXZmQSxsAKuHtnGdEH033a3jG HCXw== 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 d20si4261083edj.198.2021.11.17.20.19.18; Wed, 17 Nov 2021 20:19:19 -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 F2EE268AE5B; Thu, 18 Nov 2021 06:19:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44BF6680243 for ; Thu, 18 Nov 2021 06:18:58 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10171"; a="297530458" X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="297530458" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2021 20:18:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="672656717" Received: from otc-skl-e5-server.sh.intel.com ([10.239.43.106]) by orsmga005.jf.intel.com with ESMTP; 17 Nov 2021 20:18:55 -0800 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Nov 2021 12:18:50 +0800 Message-Id: <20211118041850.7597-2-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211118041850.7597-1-jianhua.wu@intel.com> References: <20211118041850.7597-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: hPJSz52si51b 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} (77%) diff --git a/configure b/configure index f1551063d0..7c7b3d73ac 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 31d922f75c..e2bfd08f7d 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 77% rename from libavfilter/vf_hflip_vulkan.c rename to libavfilter/vf_flip_vulkan.c index 9d164199fe..42cb4ef877 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 *ctx, AVFrame *in) +static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in, enum FlipType type) { int err = 0; FFSPIRVShader *shd; - HFlipVulkanContext *s = ctx->priv; + FlipVulkanContext *s = ctx->priv; const int planes = av_pix_fmt_count_planes(s->vkctx.output_format); FFVulkanDescriptorSetBinding image_descs[] = { @@ -75,26 +80,37 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in) if (!s->pl) return AVERROR(ENOMEM); - shd = ff_vk_init_shader(ctx, s->pl, "hflip_compute", image_descs[0].stages); + shd = ff_vk_init_shader(ctx, s->pl, "flip_compute", image_descs[0].stages); if (!shd) return AVERROR(ENOMEM); ff_vk_set_compute_shader_sizes(ctx, shd, (int [3]){ CGS, 1, 1 }); RET(ff_vk_add_descriptor_set(ctx, 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(ctx, shd, "main")); RET(ff_vk_init_pipeline_layout(ctx, s->pl)); @@ -108,9 +124,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_filter_uninit(avctx); s->initialized = 0; @@ -120,7 +136,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; FFVulkanFunctions *vk = &s->vkctx.vkfn; AVVkFrame *in = (AVVkFrame *)inframe->data[0]; AVVkFrame *out = (AVVkFrame *)outframe->data[0]; @@ -208,12 +224,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); @@ -223,7 +239,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)); @@ -239,6 +255,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 }, }; @@ -254,7 +280,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, @@ -265,12 +291,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, +};