From patchwork Tue Jun 20 17:32:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 42259 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a17:906:128a:b0:978:7aa3:2fc4 with SMTP id k10csp3688711ejb; Tue, 20 Jun 2023 10:32:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5D94JMKUu8gx+pQHswP0KES52fQKR6PikRXw0Q2adurOvlr0ONW2PCLPp3Ny/QtvCViiUk X-Received: by 2002:a05:6402:759:b0:51a:7bcd:a82d with SMTP id p25-20020a056402075900b0051a7bcda82dmr3769012edy.23.1687282360144; Tue, 20 Jun 2023 10:32:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687282360; cv=none; d=google.com; s=arc-20160816; b=T3VT+0wY1AbA9cWxQUcZ5qlgMF1LXO3wrt0Oe3m351YOUUL24hCyzUMvzAFAYhwGOP ZZf6hjPBLvkiauV3NpVxoLWYSI4Ksxh3kcJVY3KWe81nEeiiQw9HqWe6YjfKgJVxEV20 Wt7YoZVXcfCmKpedd41hDrlKGKbbZyBUPy/niqme2SNV5/Ya0tcMO75MTp6+AJ/xOZMy BDBEHMDwCFLiBlhsPNL57QjvUaZmawPQEJVT9JQ85iNNse7Tmkn0wzXfSqAq/RVG9LlM z9Z6OBXyEBmQUA82iyUGenkqPtsotqiik1v8mft8x8NMB4UN60DMdKWGaaoZpg5y4oU/ Bmog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:to:from:date:dkim-signature:delivered-to; bh=sAEPND8xXIwGiia9CKYVZdcNMbCpKPC0SC+OFCIwZMU=; b=Sukrn4W3IU28YDf/bH9e8UZlYvy8dnbCkHKZX7RFbeQswVtzI8nH0Ah0Vl/aNq+HCf Mf9pFfmfMJh6d3Pw84G+rn7zrlQN73esBIaqJr1QYL5ZwyU086AXscIQPagRqXlbVqVQ s4FEsBhBBCzIanLGjdpxpI1IXvkgxErVgfoFIJW2lN22kQqo79O0BIRLtabdsiX1hI2y DhpUWoh9vyMoGRS90Hd1LsC6iCLJO68t4cMwW1ElalPbSwJjBXcjb0OW5z+yxbBoCRHt /19Qsr7cxzzYUT9A+izCAcvpAOlHMW3NL5h7V81zrB/ccecqMvRtxoOfycfWGWJPGEQp jBzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=vOSHriSQ; 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=lynne.ee Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n15-20020a05640206cf00b0051a4c73a191si1300914edy.176.2023.06.20.10.32.39; Tue, 20 Jun 2023 10:32:40 -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=@lynne.ee header.s=s1 header.b=vOSHriSQ; 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=lynne.ee Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE4B2687F5C; Tue, 20 Jun 2023 20:32:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F02F68BF68 for ; Tue, 20 Jun 2023 20:32:29 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id 6E2DC106019B for ; Tue, 20 Jun 2023 17:32:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1687282348; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=zMwjpKINZ9HXgJqzlfiFrzX6a1ZMsVawx9n3KLW88wU=; b=vOSHriSQ6KYTMCXECV7omLRt7zsYvy8H3zK/05F33SurNsbmtrT+rYL2wOhQ9iyX KmzT1KLEiK2ckuP4fxayP6yf5zoUsG+cVB2+iIq8A80XiF4RfoqiCiK58Nkk36xybwF QPNSVm+p/N0daty4dUBg9qaCCUV7xRwMwUsBfnkV40Pe9nRL+cJFVAiVcA1XSic1LCR K38Y2rQngPdoS3hoqApYyrXxO2UVDzttCxpEibVc40VQa6hY8FmH71hh0aQRIDxN0S9 JeHTCJfHHESlL1twXfj6OCAcE+GEDe6ZHjXpSY6YjBxMgw5gl8tdtouasFmb+qZ6sjd ImtRoZZQAg== Date: Tue, 20 Jun 2023 19:32:28 +0200 (CEST) From: Lynne To: Ffmpeg Devel Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavfi: remove scale_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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: G0ComO1Yjqrm libplacebo is better in every way for anything involving scaling or format conversions Patch attached. From 146e753f3e618cb986c2649f0776f66e99098dea Mon Sep 17 00:00:00 2001 From: Lynne Date: Tue, 20 Jun 2023 18:56:26 +0200 Subject: [PATCH 1/2] lavfi: remove scale_vulkan filter libplacebo is better in every way for anything involving scaling or format conversions --- configure | 1 - libavfilter/Makefile | 1 - libavfilter/allfilters.c | 1 - libavfilter/vf_scale_vulkan.c | 419 ---------------------------------- 4 files changed, 422 deletions(-) delete mode 100644 libavfilter/vf_scale_vulkan.c diff --git a/configure b/configure index ed9efad985..81ec58bacd 100755 --- a/configure +++ b/configure @@ -3831,7 +3831,6 @@ zmq_filter_deps="libzmq" zoompan_filter_deps="swscale" zscale_filter_deps="libzimg const_nan" scale_vaapi_filter_deps="vaapi" -scale_vulkan_filter_deps="vulkan spirv_compiler" vpp_qsv_filter_deps="libmfx" vpp_qsv_filter_select="qsvvpp" xfade_opencl_filter_deps="opencl" diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 9b7813575a..62e98bbb09 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -457,7 +457,6 @@ OBJS-$(CONFIG_SCALE_CUDA_FILTER) += vf_scale_cuda.o scale_eval.o \ OBJS-$(CONFIG_SCALE_NPP_FILTER) += vf_scale_npp.o scale_eval.o OBJS-$(CONFIG_SCALE_QSV_FILTER) += vf_vpp_qsv.o OBJS-$(CONFIG_SCALE_VAAPI_FILTER) += vf_scale_vaapi.o scale_eval.o vaapi_vpp.o -OBJS-$(CONFIG_SCALE_VULKAN_FILTER) += vf_scale_vulkan.o vulkan.o vulkan_filter.o OBJS-$(CONFIG_SCALE2REF_FILTER) += vf_scale.o scale_eval.o OBJS-$(CONFIG_SCALE2REF_NPP_FILTER) += vf_scale_npp.o scale_eval.o OBJS-$(CONFIG_SCDET_FILTER) += vf_scdet.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 9a7fadc58d..eeb014248b 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -427,7 +427,6 @@ extern const AVFilter ff_vf_scale_cuda; extern const AVFilter ff_vf_scale_npp; extern const AVFilter ff_vf_scale_qsv; extern const AVFilter ff_vf_scale_vaapi; -extern const AVFilter ff_vf_scale_vulkan; extern const AVFilter ff_vf_scale2ref; extern const AVFilter ff_vf_scale2ref_npp; extern const AVFilter ff_vf_scdet; diff --git a/libavfilter/vf_scale_vulkan.c b/libavfilter/vf_scale_vulkan.c deleted file mode 100644 index 3029cf2b42..0000000000 --- a/libavfilter/vf_scale_vulkan.c +++ /dev/null @@ -1,419 +0,0 @@ -/* - * Copyright (c) Lynne - * - * 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_filter.h" -#include "vulkan_spirv.h" -#include "scale_eval.h" -#include "internal.h" -#include "colorspace.h" - -enum ScalerFunc { - F_BILINEAR = 0, - F_NEAREST, - - F_NB, -}; - -typedef struct ScaleVulkanContext { - FFVulkanContext vkctx; - - int initialized; - FFVulkanPipeline pl; - FFVkExecPool e; - FFVkQueueFamilyCtx qf; - FFVkSPIRVShader shd; - VkSampler sampler; - - /* Push constants / options */ - struct { - float yuv_matrix[4][4]; - } opts; - - char *out_format_string; - char *w_expr; - char *h_expr; - - enum ScalerFunc scaler; - enum AVColorRange out_range; -} ScaleVulkanContext; - -static const char scale_bilinear[] = { - C(0, vec4 scale_bilinear(int idx, ivec2 pos, vec2 crop_range, vec2 crop_off)) - C(0, { ) - C(1, vec2 npos = (vec2(pos) + 0.5f) / imageSize(output_img[idx]); ) - C(1, npos *= crop_range; /* Reduce the range */ ) - C(1, npos += crop_off; /* Offset the start */ ) - C(1, return texture(input_img[idx], npos); ) - C(0, } ) -}; - -static const char rgb2yuv[] = { - C(0, vec4 rgb2yuv(vec4 src, int fullrange) ) - C(0, { ) - C(1, src *= yuv_matrix; ) - C(1, if (fullrange == 1) { ) - C(2, src += vec4(0.0, 0.5, 0.5, 0.0); ) - C(1, } else { ) - C(2, src *= vec4(219.0 / 255.0, 224.0 / 255.0, 224.0 / 255.0, 1.0); ) - C(2, src += vec4(16.0 / 255.0, 128.0 / 255.0, 128.0 / 255.0, 0.0); ) - C(1, } ) - C(1, return src; ) - C(0, } ) -}; - -static const char write_nv12[] = { - C(0, void write_nv12(vec4 src, ivec2 pos) ) - C(0, { ) - C(1, imageStore(output_img[0], pos, vec4(src.r, 0.0, 0.0, 0.0)); ) - C(1, pos /= ivec2(2); ) - C(1, imageStore(output_img[1], pos, vec4(src.g, src.b, 0.0, 0.0)); ) - C(0, } ) -}; - -static const char write_420[] = { - C(0, void write_420(vec4 src, ivec2 pos) ) - C(0, { ) - C(1, imageStore(output_img[0], pos, vec4(src.r, 0.0, 0.0, 0.0)); ) - C(1, pos /= ivec2(2); ) - C(1, imageStore(output_img[1], pos, vec4(src.g, 0.0, 0.0, 0.0)); ) - C(1, imageStore(output_img[2], pos, vec4(src.b, 0.0, 0.0, 0.0)); ) - C(0, } ) -}; - -static const char write_444[] = { - C(0, void write_444(vec4 src, ivec2 pos) ) - C(0, { ) - C(1, imageStore(output_img[0], pos, vec4(src.r, 0.0, 0.0, 0.0)); ) - C(1, imageStore(output_img[1], pos, vec4(src.g, 0.0, 0.0, 0.0)); ) - C(1, imageStore(output_img[2], pos, vec4(src.b, 0.0, 0.0, 0.0)); ) - C(0, } ) -}; - -static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in) -{ - int err; - uint8_t *spv_data; - size_t spv_len; - void *spv_opaque = NULL; - VkFilter sampler_mode; - ScaleVulkanContext *s = ctx->priv; - FFVulkanContext *vkctx = &s->vkctx; - FFVkSPIRVShader *shd = &s->shd; - FFVkSPIRVCompiler *spv; - FFVulkanDescriptorSetBinding *desc; - - int crop_x = in->crop_left; - int crop_y = in->crop_top; - int crop_w = in->width - (in->crop_left + in->crop_right); - int crop_h = in->height - (in->crop_top + in->crop_bottom); - int in_planes = av_pix_fmt_count_planes(s->vkctx.input_format); - - switch (s->scaler) { - case F_NEAREST: - sampler_mode = VK_FILTER_NEAREST; - break; - case F_BILINEAR: - sampler_mode = VK_FILTER_LINEAR; - break; - }; - - spv = ff_vk_spirv_init(); - if (!spv) { - av_log(ctx, AV_LOG_ERROR, "Unable to initialize SPIR-V compiler!\n"); - return AVERROR_EXTERNAL; - } - - ff_vk_qf_init(vkctx, &s->qf, VK_QUEUE_COMPUTE_BIT); - RET(ff_vk_exec_pool_init(vkctx, &s->qf, &s->e, s->qf.nb_queues*4, 0, 0, 0, NULL)); - RET(ff_vk_init_sampler(vkctx, &s->sampler, 0, sampler_mode)); - RET(ff_vk_shader_init(&s->pl, &s->shd, "scale_compute", - VK_SHADER_STAGE_COMPUTE_BIT, 0)); - - ff_vk_shader_set_compute_sizes(&s->shd, 32, 32, 1); - - GLSLC(0, layout(push_constant, std430) uniform pushConstants { ); - GLSLC(1, mat4 yuv_matrix; ); - GLSLC(0, }; ); - GLSLC(0, ); - - ff_vk_add_push_constant(&s->pl, 0, sizeof(s->opts), - VK_SHADER_STAGE_COMPUTE_BIT); - - desc = (FFVulkanDescriptorSetBinding []) { - { - .name = "input_img", - .type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, - .dimensions = 2, - .elems = in_planes, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, - .samplers = DUP_SAMPLER(s->sampler), - }, - { - .name = "output_img", - .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, - .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format), - .mem_quali = "writeonly", - .dimensions = 2, - .elems = av_pix_fmt_count_planes(s->vkctx.output_format), - .stages = VK_SHADER_STAGE_COMPUTE_BIT, - }, - }; - - RET(ff_vk_pipeline_descriptor_set_add(vkctx, &s->pl, shd, desc, 2, 0, 0)); - - GLSLD( scale_bilinear ); - - if (s->vkctx.output_format != s->vkctx.input_format) { - GLSLD( rgb2yuv ); - } - - switch (s->vkctx.output_format) { - case AV_PIX_FMT_NV12: GLSLD(write_nv12); break; - case AV_PIX_FMT_YUV420P: GLSLD( write_420); break; - case AV_PIX_FMT_YUV444P: GLSLD( write_444); break; - default: break; - } - - GLSLC(0, void main() ); - GLSLC(0, { ); - GLSLC(1, ivec2 size; ); - GLSLC(1, ivec2 pos = ivec2(gl_GlobalInvocationID.xy); ); - GLSLF(1, vec2 in_d = vec2(%i, %i); ,in->width, in->height); - GLSLF(1, vec2 c_r = vec2(%i, %i) / in_d; ,crop_w, crop_h); - GLSLF(1, vec2 c_o = vec2(%i, %i) / in_d; ,crop_x,crop_y); - GLSLC(0, ); - - if (s->vkctx.output_format == s->vkctx.input_format) { - for (int i = 0; i < desc[i].elems; i++) { - GLSLF(1, size = imageSize(output_img[%i]); ,i); - GLSLC(1, if (IS_WITHIN(pos, size)) { ); - switch (s->scaler) { - case F_NEAREST: - case F_BILINEAR: - GLSLF(2, vec4 res = scale_bilinear(%i, pos, c_r, c_o); ,i); - GLSLF(2, imageStore(output_img[%i], pos, res); ,i); - break; - }; - GLSLC(1, } ); - } - } else { - GLSLC(1, vec4 res = scale_bilinear(0, pos, c_r, c_o); ); - GLSLF(1, res = rgb2yuv(res, %i); ,s->out_range == AVCOL_RANGE_JPEG); - switch (s->vkctx.output_format) { - case AV_PIX_FMT_NV12: GLSLC(1, write_nv12(res, pos); ); break; - case AV_PIX_FMT_YUV420P: GLSLC(1, write_420(res, pos); ); break; - case AV_PIX_FMT_YUV444P: GLSLC(1, write_444(res, pos); ); break; - default: return AVERROR(EINVAL); - } - } - - GLSLC(0, } ); - - if (s->vkctx.output_format != s->vkctx.input_format) { - const AVLumaCoefficients *lcoeffs; - double tmp_mat[3][3]; - - lcoeffs = av_csp_luma_coeffs_from_avcsp(in->colorspace); - if (!lcoeffs) { - av_log(ctx, AV_LOG_ERROR, "Unsupported colorspace\n"); - return AVERROR(EINVAL); - } - - ff_fill_rgb2yuv_table(lcoeffs, tmp_mat); - - for (int y = 0; y < 3; y++) - for (int x = 0; x < 3; x++) - s->opts.yuv_matrix[x][y] = tmp_mat[x][y]; - s->opts.yuv_matrix[3][3] = 1.0; - } - - RET(spv->compile_shader(spv, ctx, shd, &spv_data, &spv_len, "main", - &spv_opaque)); - RET(ff_vk_shader_create(vkctx, shd, spv_data, spv_len, "main")); - - RET(ff_vk_init_compute_pipeline(vkctx, &s->pl, shd)); - RET(ff_vk_exec_pipeline_register(vkctx, &s->e, &s->pl)); - - s->initialized = 1; - - return 0; - -fail: - if (spv_opaque) - spv->free_shader(spv, &spv_opaque); - if (spv) - spv->uninit(&spv); - - return err; -} - -static int scale_vulkan_filter_frame(AVFilterLink *link, AVFrame *in) -{ - int err; - AVFilterContext *ctx = link->dst; - ScaleVulkanContext *s = ctx->priv; - AVFilterLink *outlink = ctx->outputs[0]; - - AVFrame *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(ff_vk_filter_process_simple(&s->vkctx, &s->e, &s->pl, out, in, - s->sampler, &s->opts, sizeof(s->opts))); - - err = av_frame_copy_props(out, in); - if (err < 0) - goto fail; - - if (s->out_range != AVCOL_RANGE_UNSPECIFIED) - out->color_range = s->out_range; - if (s->vkctx.output_format != s->vkctx.input_format) - out->chroma_location = AVCHROMA_LOC_TOPLEFT; - - av_frame_free(&in); - - return ff_filter_frame(outlink, out); - -fail: - av_frame_free(&in); - av_frame_free(&out); - return err; -} - -static int scale_vulkan_config_output(AVFilterLink *outlink) -{ - int err; - AVFilterContext *avctx = outlink->src; - ScaleVulkanContext *s = avctx->priv; - FFVulkanContext *vkctx = &s->vkctx; - AVFilterLink *inlink = outlink->src->inputs[0]; - - err = ff_scale_eval_dimensions(s, s->w_expr, s->h_expr, inlink, outlink, - &vkctx->output_width, - &vkctx->output_height); - if (err < 0) - return err; - - if (s->out_format_string) { - s->vkctx.output_format = av_get_pix_fmt(s->out_format_string); - if (s->vkctx.output_format == AV_PIX_FMT_NONE) { - av_log(avctx, AV_LOG_ERROR, "Invalid output format.\n"); - return AVERROR(EINVAL); - } - } else { - s->vkctx.output_format = s->vkctx.input_format; - } - - if (s->vkctx.output_format != s->vkctx.input_format) { - if (!ff_vk_mt_is_np_rgb(s->vkctx.input_format)) { - av_log(avctx, AV_LOG_ERROR, "Unsupported input format for conversion\n"); - return AVERROR(EINVAL); - } - if (s->vkctx.output_format != AV_PIX_FMT_NV12 && - s->vkctx.output_format != AV_PIX_FMT_YUV420P && - s->vkctx.output_format != AV_PIX_FMT_YUV444P) { - av_log(avctx, AV_LOG_ERROR, "Unsupported output format\n"); - return AVERROR(EINVAL); - } - } else if (s->out_range != AVCOL_RANGE_UNSPECIFIED) { - av_log(avctx, AV_LOG_ERROR, "Cannot change range without converting format\n"); - return AVERROR(EINVAL); - } - - return ff_vk_filter_config_output(outlink); -} - -static void scale_vulkan_uninit(AVFilterContext *avctx) -{ - ScaleVulkanContext *s = avctx->priv; - FFVulkanContext *vkctx = &s->vkctx; - FFVulkanFunctions *vk = &vkctx->vkfn; - - ff_vk_exec_pool_free(vkctx, &s->e); - ff_vk_pipeline_free(vkctx, &s->pl); - ff_vk_shader_free(vkctx, &s->shd); - - if (s->sampler) - vk->DestroySampler(vkctx->hwctx->act_dev, s->sampler, - vkctx->hwctx->alloc); - - ff_vk_uninit(&s->vkctx); - - s->initialized = 0; -} - -#define OFFSET(x) offsetof(ScaleVulkanContext, x) -#define FLAGS (AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM) -static const AVOption scale_vulkan_options[] = { - { "w", "Output video width", OFFSET(w_expr), AV_OPT_TYPE_STRING, {.str = "iw"}, .flags = FLAGS }, - { "h", "Output video height", OFFSET(h_expr), AV_OPT_TYPE_STRING, {.str = "ih"}, .flags = FLAGS }, - { "scaler", "Scaler function", OFFSET(scaler), AV_OPT_TYPE_INT, {.i64 = F_BILINEAR}, 0, F_NB, .flags = FLAGS, "scaler" }, - { "bilinear", "Bilinear interpolation (fastest)", 0, AV_OPT_TYPE_CONST, {.i64 = F_BILINEAR}, 0, 0, .flags = FLAGS, "scaler" }, - { "nearest", "Nearest (useful for pixel art)", 0, AV_OPT_TYPE_CONST, {.i64 = F_NEAREST}, 0, 0, .flags = FLAGS, "scaler" }, - { "format", "Output video format (software format of hardware frames)", OFFSET(out_format_string), AV_OPT_TYPE_STRING, .flags = FLAGS }, - { "out_range", "Output colour range (from 0 to 2) (default 0)", OFFSET(out_range), AV_OPT_TYPE_INT, {.i64 = AVCOL_RANGE_UNSPECIFIED}, AVCOL_RANGE_UNSPECIFIED, AVCOL_RANGE_JPEG, .flags = FLAGS, "range" }, - { "full", "Full range", 0, AV_OPT_TYPE_CONST, { .i64 = AVCOL_RANGE_JPEG }, 0, 0, FLAGS, "range" }, - { "limited", "Limited range", 0, AV_OPT_TYPE_CONST, { .i64 = AVCOL_RANGE_MPEG }, 0, 0, FLAGS, "range" }, - { "jpeg", "Full range", 0, AV_OPT_TYPE_CONST, { .i64 = AVCOL_RANGE_JPEG }, 0, 0, FLAGS, "range" }, - { "mpeg", "Limited range", 0, AV_OPT_TYPE_CONST, { .i64 = AVCOL_RANGE_MPEG }, 0, 0, FLAGS, "range" }, - { "tv", "Limited range", 0, AV_OPT_TYPE_CONST, { .i64 = AVCOL_RANGE_MPEG }, 0, 0, FLAGS, "range" }, - { "pc", "Full range", 0, AV_OPT_TYPE_CONST, { .i64 = AVCOL_RANGE_JPEG }, 0, 0, FLAGS, "range" }, - { NULL }, -}; - -AVFILTER_DEFINE_CLASS(scale_vulkan); - -static const AVFilterPad scale_vulkan_inputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = &scale_vulkan_filter_frame, - .config_props = &ff_vk_filter_config_input, - }, -}; - -static const AVFilterPad scale_vulkan_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = &scale_vulkan_config_output, - }, -}; - -const AVFilter ff_vf_scale_vulkan = { - .name = "scale_vulkan", - .description = NULL_IF_CONFIG_SMALL("Scale Vulkan frames"), - .priv_size = sizeof(ScaleVulkanContext), - .init = &ff_vk_filter_init, - .uninit = &scale_vulkan_uninit, - FILTER_INPUTS(scale_vulkan_inputs), - FILTER_OUTPUTS(scale_vulkan_outputs), - FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VULKAN), - .priv_class = &scale_vulkan_class, - .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, - .flags = AVFILTER_FLAG_HWDEVICE, -}; -- 2.40.1 From patchwork Tue Jun 20 17:33:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 42260 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a17:906:128a:b0:978:7aa3:2fc4 with SMTP id k10csp3689012ejb; Tue, 20 Jun 2023 10:33:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5aCtoZ3Nisi3XlLz3+3hFcn08/D2DxmucZCcngQWNc848PaJ/MU6C83YVfcAR3MNZ4Y62J X-Received: by 2002:a17:907:7213:b0:982:4325:ce51 with SMTP id dr19-20020a170907721300b009824325ce51mr11284491ejc.47.1687282395796; Tue, 20 Jun 2023 10:33:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687282395; cv=none; d=google.com; s=arc-20160816; b=0138gJQ3zqXU3jZQ9ldr19jGlkbakZJ3fSNAWdaYTr1rWZ31Jl3C/2yr9KyajD79JC jm/JwrDlPqCZdkp9B3eK3oteLBoyPI9Z6OIdZyTKEPREjHAIrQyuhg73++eCs8LdbrnX 6Bw7/KgkywMJccb3mg3lMMFluCzbaU0HMCUobmjVbh12qIwqmibXJX4QvodLVrORYgNy CSRlbtMYhJ6uQeaosjL/rbGgQBBQpCy2O9yWggoZJkQkvg0Ddecwm1T+qKBND+0mOn4l FPDsNmSt6EPoZWm4CZ528IZd/mTAkZDmb8/cFIdhYtNTz5UrksPLzkwlZFXcC7w3zdNI I6ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:to:from:date:dkim-signature:delivered-to; bh=bU7ZNDTERI15m+28NSbh+cAM5FkvR9gnZRORtjYKHqA=; b=OjE5085WJLQJ6+XWL1kkWi7Lsy8P7OCOFW1I4ytGsfRZ4MxnosL7DclfZaBWRPQspw dnDbFbYZpz4Z2nwnoHy+RGWsggp+4tHec7RNJ4eNLRsixKkprZp+CKo4x4hEe9fXe0tw bGgRLHET9PGjr5SCE+cxF87gbk7DhK8hp9xIJ5uoSb8EehhfmQkhK394mqFixKdQG0xj n1okK8hbZUXLFcj3AOR6n1phKsqHgLE/ugIsenIUceLa8eItiVEMJGGOSEAZFFaswJ+w lxNTfNPes6lc/hvCWVIO0r3hM94X6OqXywS1X3gFnxVrHFqyqascCEYgQEEhuNJKAQ7g mJRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=S1pPdZNp; 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=lynne.ee Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ks10-20020a170906f84a00b00988635d8c25si1347607ejb.603.2023.06.20.10.33.15; Tue, 20 Jun 2023 10:33:15 -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=@lynne.ee header.s=s1 header.b=S1pPdZNp; 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=lynne.ee Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D170668C159; Tue, 20 Jun 2023 20:33:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C441F68A4A6 for ; Tue, 20 Jun 2023 20:33:05 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id C2392106015E for ; Tue, 20 Jun 2023 17:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1687282385; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=mWy8/lOGsGe8UXqMzVl840fS71rR6CithIUotrL8ATc=; b=S1pPdZNpv6Vq6DH2WK+C7oESLsdsW/rQZiKA9IaB0D6CGZoXW5GXwinBZKsIokBq WC1XQUJugNe/GbBKMkUzWyT4bvbWG6k56tpPtuVnB9x0Yye+qdO+cSCGeLp1V3bZDsJ nXJje2GUwfplDRiKvatk1tamM1fwidCL/yWkmjc3NDw05uWBoYxeAk9NqMm9BPZFUps qhamzGn6gvH/JPaBX4R48jbrsIWV/ws0CJxJj7Jw7f/jmwwcQcCUh34nq3knoj7NcTa iYFOsTelYwAZfDuRuNNjuaLygV0eyN1LXQ+OhEwiSDtiG/7Vj+SP04sK8L021aqyKej oosGSOpvvA== Date: Tue, 20 Jun 2023 19:33:05 +0200 (CEST) From: Lynne To: Ffmpeg Devel Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] overlay_vulkan: remove in favor of libplacebo 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fstdJ8NcPmpc Patch attached. From 453c513bb4960dee72228a8713375fce75a40482 Mon Sep 17 00:00:00 2001 From: Lynne Date: Tue, 20 Jun 2023 18:59:03 +0200 Subject: [PATCH 2/2] lavfi: remove overlay_vulkan in favor of libplacebo --- configure | 1 - doc/filters.texi | 20 -- libavfilter/Makefile | 1 - libavfilter/allfilters.c | 1 - libavfilter/vf_overlay_vulkan.c | 346 -------------------------------- 5 files changed, 369 deletions(-) delete mode 100644 libavfilter/vf_overlay_vulkan.c diff --git a/configure b/configure index 81ec58bacd..df3ae8cb77 100755 --- a/configure +++ b/configure @@ -3772,7 +3772,6 @@ overlay_opencl_filter_deps="opencl" overlay_qsv_filter_deps="libmfx" overlay_qsv_filter_select="qsvvpp" overlay_vaapi_filter_deps="vaapi VAProcPipelineCaps_blend_flags" -overlay_vulkan_filter_deps="vulkan spirv_compiler" owdenoise_filter_deps="gpl" pad_opencl_filter_deps="opencl" pan_filter_deps="swresample" diff --git a/doc/filters.texi b/doc/filters.texi index f596773af6..bf70fadacb 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -27613,26 +27613,6 @@ Must be odd number in range [0, 99]. @end table -@section overlay_vulkan - -Overlay one video on top of another. - -It takes two inputs and has one output. The first input is the "main" video on which the second input is overlaid. -This filter requires all inputs to use the same pixel format. So, format conversion may be needed. - -The filter accepts the following options: - -@table @option -@item x -Set the x coordinate of the overlaid video on the main video. -Default value is @code{0}. - -@item y -Set the y coordinate of the overlaid video on the main video. -Default value is @code{0}. - -@end table - @section transpose_vulkan Transpose rows with columns in the input video and optionally flip it. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 62e98bbb09..27c02570b2 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -409,7 +409,6 @@ OBJS-$(CONFIG_OVERLAY_OPENCL_FILTER) += vf_overlay_opencl.o opencl.o \ opencl/overlay.o framesync.o OBJS-$(CONFIG_OVERLAY_QSV_FILTER) += vf_overlay_qsv.o framesync.o OBJS-$(CONFIG_OVERLAY_VAAPI_FILTER) += vf_overlay_vaapi.o framesync.o vaapi_vpp.o -OBJS-$(CONFIG_OVERLAY_VULKAN_FILTER) += vf_overlay_vulkan.o vulkan.o vulkan_filter.o OBJS-$(CONFIG_OWDENOISE_FILTER) += vf_owdenoise.o OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o OBJS-$(CONFIG_PAD_OPENCL_FILTER) += vf_pad_opencl.o opencl.o opencl/pad.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index eeb014248b..3b379a0d38 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -382,7 +382,6 @@ extern const AVFilter ff_vf_overlay; extern const AVFilter ff_vf_overlay_opencl; extern const AVFilter ff_vf_overlay_qsv; extern const AVFilter ff_vf_overlay_vaapi; -extern const AVFilter ff_vf_overlay_vulkan; extern const AVFilter ff_vf_overlay_cuda; extern const AVFilter ff_vf_owdenoise; extern const AVFilter ff_vf_pad; diff --git a/libavfilter/vf_overlay_vulkan.c b/libavfilter/vf_overlay_vulkan.c deleted file mode 100644 index ef8e9fd59b..0000000000 --- a/libavfilter/vf_overlay_vulkan.c +++ /dev/null @@ -1,346 +0,0 @@ -/* - * Copyright (c) Lynne - * - * 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_filter.h" -#include "vulkan_spirv.h" -#include "internal.h" -#include "framesync.h" - -typedef struct OverlayVulkanContext { - FFVulkanContext vkctx; - FFFrameSync fs; - - int initialized; - FFVulkanPipeline pl; - FFVkExecPool e; - FFVkQueueFamilyCtx qf; - FFVkSPIRVShader shd; - VkSampler sampler; - - /* Push constants / options */ - struct { - int32_t o_offset[2*3]; - int32_t o_size[2*3]; - } opts; - - int overlay_x; - int overlay_y; - int overlay_w; - int overlay_h; -} OverlayVulkanContext; - -static const char overlay_noalpha[] = { - C(0, void overlay_noalpha(int i, ivec2 pos) ) - C(0, { ) - C(1, if ((o_offset[i].x <= pos.x) && (o_offset[i].y <= pos.y) && - (pos.x < (o_offset[i].x + o_size[i].x)) && - (pos.y < (o_offset[i].y + o_size[i].y))) { ) - C(2, vec4 res = texture(overlay_img[i], pos - o_offset[i]); ) - C(2, imageStore(output_img[i], pos, res); ) - C(1, } else { ) - C(2, vec4 res = texture(main_img[i], pos); ) - C(2, imageStore(output_img[i], pos, res); ) - C(1, } ) - C(0, } ) -}; - -static const char overlay_alpha[] = { - C(0, void overlay_alpha_opaque(int i, ivec2 pos) ) - C(0, { ) - C(1, vec4 res = texture(main_img[i], pos); ) - C(1, if ((o_offset[i].x <= pos.x) && (o_offset[i].y <= pos.y) && - (pos.x < (o_offset[i].x + o_size[i].x)) && - (pos.y < (o_offset[i].y + o_size[i].y))) { ) - C(2, vec4 ovr = texture(overlay_img[i], pos - o_offset[i]); ) - C(2, res = ovr * ovr.a + res * (1.0f - ovr.a); ) - C(2, res.a = 1.0f; ) - C(2, imageStore(output_img[i], pos, res); ) - C(1, } ) - C(1, imageStore(output_img[i], pos, res); ) - C(0, } ) -}; - -static av_cold int init_filter(AVFilterContext *ctx) -{ - int err; - uint8_t *spv_data; - size_t spv_len; - void *spv_opaque = NULL; - OverlayVulkanContext *s = ctx->priv; - FFVulkanContext *vkctx = &s->vkctx; - const int planes = av_pix_fmt_count_planes(s->vkctx.output_format); - const int ialpha = av_pix_fmt_desc_get(s->vkctx.input_format)->flags & AV_PIX_FMT_FLAG_ALPHA; - const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(s->vkctx.output_format); - FFVkSPIRVShader *shd = &s->shd; - FFVkSPIRVCompiler *spv; - FFVulkanDescriptorSetBinding *desc; - - spv = ff_vk_spirv_init(); - if (!spv) { - av_log(ctx, AV_LOG_ERROR, "Unable to initialize SPIR-V compiler!\n"); - return AVERROR_EXTERNAL; - } - - ff_vk_qf_init(vkctx, &s->qf, VK_QUEUE_COMPUTE_BIT); - RET(ff_vk_exec_pool_init(vkctx, &s->qf, &s->e, s->qf.nb_queues*4, 0, 0, 0, NULL)); - RET(ff_vk_init_sampler(vkctx, &s->sampler, 1, VK_FILTER_NEAREST)); - RET(ff_vk_shader_init(&s->pl, &s->shd, "overlay_compute", - VK_SHADER_STAGE_COMPUTE_BIT, 0)); - - ff_vk_shader_set_compute_sizes(&s->shd, 32, 32, 1); - - GLSLC(0, layout(push_constant, std430) uniform pushConstants { ); - GLSLC(1, ivec2 o_offset[3]; ); - GLSLC(1, ivec2 o_size[3]; ); - GLSLC(0, }; ); - GLSLC(0, ); - - ff_vk_add_push_constant(&s->pl, 0, sizeof(s->opts), - VK_SHADER_STAGE_COMPUTE_BIT); - - desc = (FFVulkanDescriptorSetBinding []) { - { - .name = "main_img", - .type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, - .dimensions = 2, - .elems = planes, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, - .samplers = DUP_SAMPLER(s->sampler), - }, - { - .name = "overlay_img", - .type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, - .dimensions = 2, - .elems = planes, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, - .samplers = DUP_SAMPLER(s->sampler), - }, - { - .name = "output_img", - .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, - }, - }; - - RET(ff_vk_pipeline_descriptor_set_add(vkctx, &s->pl, shd, desc, 3, 0, 0)); - - GLSLD( overlay_noalpha ); - GLSLD( overlay_alpha ); - GLSLC(0, void main() ); - GLSLC(0, { ); - GLSLC(1, ivec2 pos = ivec2(gl_GlobalInvocationID.xy); ); - GLSLF(1, int planes = %i; ,planes); - GLSLC(1, for (int i = 0; i < planes; i++) { ); - if (ialpha) - GLSLC(2, overlay_alpha_opaque(i, pos); ); - else - GLSLC(2, overlay_noalpha(i, pos); ); - GLSLC(1, } ); - GLSLC(0, } ); - - RET(spv->compile_shader(spv, ctx, shd, &spv_data, &spv_len, "main", - &spv_opaque)); - RET(ff_vk_shader_create(vkctx, shd, spv_data, spv_len, "main")); - - RET(ff_vk_init_compute_pipeline(vkctx, &s->pl, shd)); - RET(ff_vk_exec_pipeline_register(vkctx, &s->e, &s->pl)); - - s->opts.o_offset[0] = s->overlay_x; - s->opts.o_offset[1] = s->overlay_y; - s->opts.o_offset[2] = s->opts.o_offset[0] >> pix_desc->log2_chroma_w; - s->opts.o_offset[3] = s->opts.o_offset[1] >> pix_desc->log2_chroma_h; - s->opts.o_offset[4] = s->opts.o_offset[0] >> pix_desc->log2_chroma_w; - s->opts.o_offset[5] = s->opts.o_offset[1] >> pix_desc->log2_chroma_h; - - s->opts.o_size[0] = s->overlay_w; - s->opts.o_size[1] = s->overlay_h; - s->opts.o_size[2] = s->opts.o_size[0] >> pix_desc->log2_chroma_w; - s->opts.o_size[3] = s->opts.o_size[1] >> pix_desc->log2_chroma_h; - s->opts.o_size[4] = s->opts.o_size[0] >> pix_desc->log2_chroma_w; - s->opts.o_size[5] = s->opts.o_size[1] >> pix_desc->log2_chroma_h; - - s->initialized = 1; - -fail: - if (spv_opaque) - spv->free_shader(spv, &spv_opaque); - if (spv) - spv->uninit(&spv); - - return err; -} - -static int overlay_vulkan_blend(FFFrameSync *fs) -{ - int err; - AVFilterContext *ctx = fs->parent; - OverlayVulkanContext *s = ctx->priv; - AVFilterLink *outlink = ctx->outputs[0]; - AVFrame *input_main, *input_overlay, *out; - - err = ff_framesync_get_frame(fs, 0, &input_main, 0); - if (err < 0) - goto fail; - err = ff_framesync_get_frame(fs, 1, &input_overlay, 0); - if (err < 0) - goto fail; - - if (!input_main || !input_overlay) - return 0; - - if (!s->initialized) { - AVHWFramesContext *main_fc = (AVHWFramesContext*)input_main->hw_frames_ctx->data; - AVHWFramesContext *overlay_fc = (AVHWFramesContext*)input_overlay->hw_frames_ctx->data; - if (main_fc->sw_format != overlay_fc->sw_format) { - av_log(ctx, AV_LOG_ERROR, "Mismatching sw formats!\n"); - return AVERROR(EINVAL); - } - - s->overlay_w = input_overlay->width; - s->overlay_h = input_overlay->height; - - RET(init_filter(ctx)); - } - - out = ff_get_video_buffer(outlink, outlink->w, outlink->h); - if (!out) { - err = AVERROR(ENOMEM); - goto fail; - } - - RET(ff_vk_filter_process_Nin(&s->vkctx, &s->e, &s->pl, - out, (AVFrame *[]){ input_main, input_overlay }, 2, - s->sampler, &s->opts, sizeof(s->opts))); - - err = av_frame_copy_props(out, input_main); - if (err < 0) - goto fail; - - return ff_filter_frame(outlink, out); - -fail: - av_frame_free(&out); - return err; -} - -static int overlay_vulkan_config_output(AVFilterLink *outlink) -{ - int err; - AVFilterContext *avctx = outlink->src; - OverlayVulkanContext *s = avctx->priv; - - err = ff_vk_filter_config_output(outlink); - if (err < 0) - return err; - - err = ff_framesync_init_dualinput(&s->fs, avctx); - if (err < 0) - return err; - - return ff_framesync_configure(&s->fs); -} - -static int overlay_vulkan_activate(AVFilterContext *avctx) -{ - OverlayVulkanContext *s = avctx->priv; - - return ff_framesync_activate(&s->fs); -} - -static av_cold int overlay_vulkan_init(AVFilterContext *avctx) -{ - OverlayVulkanContext *s = avctx->priv; - - s->fs.on_event = &overlay_vulkan_blend; - - return ff_vk_filter_init(avctx); -} - -static void overlay_vulkan_uninit(AVFilterContext *avctx) -{ - OverlayVulkanContext *s = avctx->priv; - FFVulkanContext *vkctx = &s->vkctx; - FFVulkanFunctions *vk = &vkctx->vkfn; - - ff_vk_exec_pool_free(vkctx, &s->e); - ff_vk_pipeline_free(vkctx, &s->pl); - ff_vk_shader_free(vkctx, &s->shd); - - if (s->sampler) - vk->DestroySampler(vkctx->hwctx->act_dev, s->sampler, - vkctx->hwctx->alloc); - - ff_vk_uninit(&s->vkctx); - ff_framesync_uninit(&s->fs); - - s->initialized = 0; -} - -#define OFFSET(x) offsetof(OverlayVulkanContext, x) -#define FLAGS (AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM) -static const AVOption overlay_vulkan_options[] = { - { "x", "Set horizontal offset", OFFSET(overlay_x), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, .flags = FLAGS }, - { "y", "Set vertical offset", OFFSET(overlay_y), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, .flags = FLAGS }, - { NULL }, -}; - -AVFILTER_DEFINE_CLASS(overlay_vulkan); - -static const AVFilterPad overlay_vulkan_inputs[] = { - { - .name = "main", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = &ff_vk_filter_config_input, - }, - { - .name = "overlay", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = &ff_vk_filter_config_input, - }, -}; - -static const AVFilterPad overlay_vulkan_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = &overlay_vulkan_config_output, - }, -}; - -const AVFilter ff_vf_overlay_vulkan = { - .name = "overlay_vulkan", - .description = NULL_IF_CONFIG_SMALL("Overlay a source on top of another"), - .priv_size = sizeof(OverlayVulkanContext), - .init = &overlay_vulkan_init, - .uninit = &overlay_vulkan_uninit, - .activate = &overlay_vulkan_activate, - FILTER_INPUTS(overlay_vulkan_inputs), - FILTER_OUTPUTS(overlay_vulkan_outputs), - FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VULKAN), - .priv_class = &overlay_vulkan_class, - .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, - .flags = AVFILTER_FLAG_HWDEVICE, -}; -- 2.40.1