From patchwork Tue Nov 8 13:12:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 39236 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2824114pzb; Tue, 8 Nov 2022 05:12:56 -0800 (PST) X-Google-Smtp-Source: AA0mqf5QpYXSKwDDxUvlsE0oxzBHK+3Gr5q/rUAn5ku8QqtiRt1akcoo4/tRFzWt2nVnh0qEr179 X-Received: by 2002:a17:907:948f:b0:7ae:8144:66f with SMTP id dm15-20020a170907948f00b007ae8144066fmr1899133ejc.742.1667913176185; Tue, 08 Nov 2022 05:12:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667913176; cv=none; d=google.com; s=arc-20160816; b=KiBoq60g55wtPW5vtg6edpwglp8ZsuTGllJjjJeU2AdxML7Ewc7eUhR6kvVT30aRiC yeMg+irg45PX26SH8JrvOb1+utiiavqz/GIUoYhIGVbpe1TGZKm78q6Gped2t3bEGV3W osC3fByI53fP96owjQmIwMQzEOj9A9TbmSI8Nk81nKdmcBgwQhZkjKxtxU1ViIrdQwku GkEDtho+U1owRMe+Y4QhlPxZR8Eyi7p++Ee670Pu8WBd+EkQO6gviPXBqC8Eawc0/ab2 vFrEaxFKep0uj5X9zwjBDIopbVPePT9Tm/z9zNGsXJSKu0JgNsQ8Gtv10jcLHpD46RXX 9f7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=rgX88Q9uoHC3WXHdzTtGGSdpYLDSNZVnmB0ilWosCZ0=; b=OU20VMzXGbw7X/8geZIO0inwVrAZaNQVNFo4hMfnuP/MXgy3cPAPxGUKZQYJfwVxgI utoegjoZ05lPxLwUIrkq7qgKQoZWtOh31RNqxEEkU8+Wwco8DtoYl8amYHN2+5Q8GnAg YWzec1Sp+feiwmkXj3ZSl+/sHlcSD8/xK74o/Wkw4SgB2D21phBPnZBzw5WeNIvc6DUz uiCX4UgsWqyB/0V56aYd3t17tgmr26t4Niuasj38hc0LZbBND48lv0Hc8cbxsKvJrRZ6 4bJ7h3ShXKdXqB7Nq696TI+tkIl1VSukJ1+zUz60WDREyO+iIpsYGVlgGeHH23pJOuOk Atkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=TvBCHVVG; 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 r12-20020aa7c14c000000b00456d901922bsi10125936edp.510.2022.11.08.05.12.55; Tue, 08 Nov 2022 05:12:56 -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=@haasn.xyz header.s=mail header.b=TvBCHVVG; 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 249AC68BBE5; Tue, 8 Nov 2022 15:12:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C03B168BA0F for ; Tue, 8 Nov 2022 15:12:37 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 2673140DBA; Tue, 8 Nov 2022 14:12:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1667913157; bh=st8O50ndBTfAYtPDMsU97b0FnjpNoG6SFR7mnX4g01Y=; h=From:To:Cc:Subject:Date:From; b=TvBCHVVGvm7Wlbixvis1DkQz+x18e+jdugHmdSuFKMUyXVK9FS6BwqphU422ygbWv gr9KxRFgTdbUDtTBR/fz7M8bNdDCWZXsBsLuaFcOb7tjAyiGMEGsn8PUDuO4g3drum Rg/5ewbQl3G1vbEXYQWqJnTtU+mPxP9INevukd1s= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Nov 2022 14:12:29 +0100 Message-Id: <20221108131230.39188-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.38.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/vf_libplacebo: init vulkan device in query_format 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DuAw/n6nyE6A From: Niklas Haas Instead of doing it ad-hoc in `filter_frame`. This is not a huge change on its own, but paves the way for adding support for more formats in the future, in particular formats other than AV_PIX_FMT_VULKAN. --- libavfilter/vf_libplacebo.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index cfee1117e8..cb6b021816 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -56,7 +56,6 @@ static const struct pl_tone_map_function * const tonemapping_funcs[TONE_MAP_COUN typedef struct LibplaceboContext { /* lavfi vulkan*/ FFVulkanContext vkctx; - int initialized; /* libplacebo */ pl_log log; @@ -237,10 +236,17 @@ static int init_vulkan(AVFilterContext *avctx) { int err = 0; LibplaceboContext *s = avctx->priv; - const AVVulkanDeviceContext *hwctx = s->vkctx.hwctx; + const AVVulkanDeviceContext *hwctx; uint8_t *buf = NULL; size_t buf_len; + if (!avctx->hw_device_ctx) { + av_log(s, AV_LOG_ERROR, "Missing vulkan hwdevice for vf_libplacebo.\n"); + return AVERROR(EINVAL); + } + + hwctx = ((AVHWDeviceContext*) avctx->hw_device_ctx->data)->hwctx; + /* Import libavfilter vulkan context into libplacebo */ s->vulkan = pl_vulkan_import(s->log, pl_vulkan_import_params( .instance = hwctx->inst, @@ -289,7 +295,6 @@ static int init_vulkan(AVFilterContext *avctx) fail: if (buf) av_file_unmap(buf, buf_len); - s->initialized = 1; return err; } @@ -303,7 +308,6 @@ static void libplacebo_uninit(AVFilterContext *avctx) pl_vulkan_destroy(&s->vulkan); pl_log_destroy(&s->log); ff_vk_uninit(&s->vkctx); - s->initialized = 0; s->gpu = NULL; } @@ -452,8 +456,6 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) } pl_log_level_update(s->log, get_log_level()); - if (!s->initialized) - RET(init_vulkan(ctx)); RET(av_frame_copy_props(out, in)); out->width = outlink->w; @@ -505,6 +507,25 @@ fail: return err; } +static int libplacebo_query_format(AVFilterContext *ctx) +{ + int err = 0; + static const enum AVPixelFormat pix_fmts[] = { + AV_PIX_FMT_VULKAN, AV_PIX_FMT_NONE, + }; + + RET(init_vulkan(ctx)); + + RET(ff_formats_ref(ff_make_format_list(pix_fmts), + &ctx->inputs[0]->outcfg.formats)); + RET(ff_formats_ref(ff_make_format_list(pix_fmts), + &ctx->outputs[0]->incfg.formats)); + return 0; + +fail: + return err; +} + static int libplacebo_config_output(AVFilterLink *outlink) { int err; @@ -755,7 +776,7 @@ const AVFilter ff_vf_libplacebo = { .process_command = &ff_filter_process_command, FILTER_INPUTS(libplacebo_inputs), FILTER_OUTPUTS(libplacebo_outputs), - FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VULKAN), + FILTER_QUERY_FUNC(libplacebo_query_format), .priv_class = &libplacebo_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; From patchwork Tue Nov 8 13:12:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 39235 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2824041pzb; Tue, 8 Nov 2022 05:12:47 -0800 (PST) X-Google-Smtp-Source: AMsMyM5uK8oW+xq2yEgETZ5rtxL3W5udhk0RfWESj6yEsp0LQMoiFPK3awzFzMS6o0VITkAvSdXw X-Received: by 2002:a17:907:2bd7:b0:7ad:9ada:a6f3 with SMTP id gv23-20020a1709072bd700b007ad9adaa6f3mr51031413ejc.355.1667913167640; Tue, 08 Nov 2022 05:12:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667913167; cv=none; d=google.com; s=arc-20160816; b=E62SFVcrkw1eD+Y58fdAGkBHeVAi2Wd9MUua00/GsSu/WUpntS+pBZbaNoUY0/WT+t t77/AA9cEoxYe5D9Px0q7kBRH2uksrBtycwx8tizBALJEBEZD+Z8V3QXkSumzqgjMfER ScdV4UBSPsrYmOkFi4e6EPf+XxuJ/L9Ou+/jm4J/1G9SCUzHBYH39Z8arj2SWXSLrilX 3/6yyH4ht982IZlyZ8Bs6j3bz4NkmWo93FJ/AF7TLlNcTqj8BsXStH3+7pmbZjlrFQlo HL+9L87UVDopeViibur9dTqlPo9YUS4waDgt5CZ3DpeaUMV7wC7cQGH9+twuqABlXrGe DBNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=B2HSMsxgb7ML+QsAxPPgPhO/lEc2ijbRvfB8FqAbyb4=; b=NlgdGvvF7QMmAAD0iEmN8yD0HHM6aUbnnp/JasWX2eRI8H+GMbhdAMkIeFjL0LTu+b qJoJGa4XvIFCqU8KhBss1d2KNIjqxSQAoQVw1W+3nJ0GjftF1WVWBYDyMTp9GotZII6P +XkJrlYbSBIbm1MJWec2g8TAO8Cpxg93XNuQdCuYzPNa7an65GY9n/xNDO+nPAUq2Wf/ Wb7oa0ho8AxkGpt8oKMpMcv6JH0f/6MWZjpHgkVIy6V3PGlVHE9uQe6psuOgbTNMl97R cShL+qE9HAxrewlEiXjqYps6edsXN9pDng25lXoISL9RLqqbS4LQk2pbfsOvNEt/fz3s rXdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b="cj6/j06j"; 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 q21-20020aa7da95000000b0045961c7dde9si11202486eds.63.2022.11.08.05.12.46; Tue, 08 Nov 2022 05:12:47 -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=@haasn.xyz header.s=mail header.b="cj6/j06j"; 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 166D468BBA5; Tue, 8 Nov 2022 15:12:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BBCF768B934 for ; Tue, 8 Nov 2022 15:12:37 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 6CEEF40DFC; Tue, 8 Nov 2022 14:12:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1667913157; bh=Vpcbo1J2FwGiLoUClnqPG5YtY70CKNHdXFfg5Fbv7Gk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cj6/j06jknZWF0NkEDN0mnc9WzRtJagP15N+XvLs18IiI3IiBlZB68KeBHeEaDLR8 Ofpm8fUj0FS2uSRigvQ+ICDzoDCQnUqHXa0n1PkLuak6e6aV4l0bFn0EfrloPCqoRG CIieR9jxn0SbkBQfeB62scfLUjHgb9m706XoajFY= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Nov 2022 14:12:30 +0100 Message-Id: <20221108131230.39188-2-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221108131230.39188-1-ffmpeg@haasn.xyz> References: <20221108131230.39188-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_libplacebo: support all supported pixfmts 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Vn+iH43fPwAE From: Niklas Haas This is done only to the inputs, not the outputs, because we always output vulkan hwframes. Doing so also requires keeping track of backing textures for non-hwdec formats, but is otherwise a mostly straightforward change to the format query function. Special care needs to be taken to avoid crashing on older libplacebo due to AV_PIX_FMT_RGBF32LE et al. --- libavfilter/vf_libplacebo.c | 41 ++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index cb6b021816..fa9a7675d1 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -62,6 +62,7 @@ typedef struct LibplaceboContext { pl_vulkan vulkan; pl_gpu gpu; pl_renderer renderer; + pl_tex tex[4]; /* settings */ char *out_format_string; @@ -302,6 +303,8 @@ static void libplacebo_uninit(AVFilterContext *avctx) { LibplaceboContext *s = avctx->priv; + for (int i = 0; i < FF_ARRAY_ELEMS(s->tex); i++) + pl_tex_destroy(s->gpu, &s->tex[i]); for (int i = 0; i < s->num_hooks; i++) pl_mpv_user_shader_destroy(&s->hooks[i]); pl_renderer_destroy(&s->renderer); @@ -321,6 +324,7 @@ static int process_frames(AVFilterContext *avctx, AVFrame *out, AVFrame *in) struct pl_frame image, target; ok = pl_map_avframe_ex(s->gpu, &image, pl_avframe_params( .frame = in, + .tex = s->tex, .map_dovi = s->apply_dovi, )); @@ -510,22 +514,49 @@ fail: static int libplacebo_query_format(AVFilterContext *ctx) { int err = 0; - static const enum AVPixelFormat pix_fmts[] = { + LibplaceboContext *s = ctx->priv; + const AVPixFmtDescriptor *desc = NULL; + AVFilterFormats *in_fmts = NULL; + static const enum AVPixelFormat out_fmts[] = { AV_PIX_FMT_VULKAN, AV_PIX_FMT_NONE, }; RET(init_vulkan(ctx)); - RET(ff_formats_ref(ff_make_format_list(pix_fmts), - &ctx->inputs[0]->outcfg.formats)); - RET(ff_formats_ref(ff_make_format_list(pix_fmts), + while ((desc = av_pix_fmt_desc_next(desc))) { + +#if PL_API_VER < 232 + // Older libplacebo can't handle >64-bit pixel formats, so safe-guard + // this to prevent triggering an assertion + if (av_get_bits_per_pixel(desc) > 64) + continue; +#endif + + enum AVPixelFormat pixfmt = av_pix_fmt_desc_get_id(desc); + if (pl_test_pixfmt(s->gpu, pixfmt)) { + if ((err = ff_add_format(&in_fmts, pixfmt)) < 0) + return err; + } + } + + RET(ff_formats_ref(in_fmts, &ctx->inputs[0]->outcfg.formats)); + RET(ff_formats_ref(ff_make_format_list(out_fmts), &ctx->outputs[0]->incfg.formats)); + return 0; fail: return err; } +static int libplacebo_config_input(AVFilterLink *inlink) +{ + if (inlink->format == AV_PIX_FMT_VULKAN) + return ff_vk_filter_config_input(inlink); + + return 0; +} + static int libplacebo_config_output(AVFilterLink *outlink) { int err; @@ -755,7 +786,7 @@ static const AVFilterPad libplacebo_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .filter_frame = &filter_frame, - .config_props = &ff_vk_filter_config_input, + .config_props = &libplacebo_config_input, }, };