From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D5E69493D7 for ; Fri, 9 Feb 2024 14:54:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 17A7068D105; Fri, 9 Feb 2024 16:54:05 +0200 (EET) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 732F768CD10 for ; Fri, 9 Feb 2024 16:53:55 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1707490435; bh=J19phigtRYTip2hDAO1uOgml6xOBXBUrA3CzOKh3RCo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j+mGty5nqzk6Pn+a4OYgN5ZSaCnghgadUxYGEFFYbbe9/GIcfqpukI6+SFEk1XUq+ gSI6ylVNJhjeH95mPdGoq14clfscL692Vu5FabfjZ9P4YnXPqJ+w3PLiwkfY8oWoEM 8FUAV0xthpeGaJq1twKekPMn0ayNj9HAuy+yy4uA= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 3698341905; Fri, 9 Feb 2024 15:53:55 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Feb 2024 15:53:48 +0100 Message-ID: <20240209145349.104511-4-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240209145349.104511-1-ffmpeg@haasn.xyz> References: <20240209145349.104511-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avfilter/libplacebo: move hwctx init to init() 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Niklas Haas --- libavfilter/vf_libplacebo.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index a9a3d884ce..f41d8be0c0 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -544,6 +544,7 @@ static int parse_shader(AVFilterContext *avctx, const void *shader, size_t len) static void libplacebo_uninit(AVFilterContext *avctx); static int libplacebo_config_input(AVFilterLink *inlink); +static int init_vulkan(AVFilterContext *avctx); static int libplacebo_init(AVFilterContext *avctx) { @@ -610,8 +611,7 @@ static int libplacebo_init(AVFilterContext *avctx) if (strcmp(s->fps_string, "none") != 0) RET(av_parse_video_rate(&s->fps, s->fps_string)); - /* Note: s->vulkan etc. are initialized later, when hwctx is available */ - return 0; + return init_vulkan(avctx); fail: return err; @@ -656,13 +656,20 @@ static void input_uninit(LibplaceboInput *input) av_fifo_freep2(&input->out_pts); } -static int init_vulkan(AVFilterContext *avctx, const AVVulkanDeviceContext *hwctx) +static int init_vulkan(AVFilterContext *avctx) { int err = 0; LibplaceboContext *s = avctx->priv; + const AVVulkanDeviceContext *hwctx = NULL; uint8_t *buf = NULL; size_t buf_len; + if (avctx->hw_device_ctx) { + const AVHWDeviceContext *avhwctx = (void *) avctx->hw_device_ctx->data; + if (avhwctx->type == AV_HWDEVICE_TYPE_VULKAN) + hwctx = s->vkctx.hwctx = avhwctx->hwctx; + } + if (hwctx) { #if PL_API_VER >= 278 /* Import libavfilter vulkan context into libplacebo */ @@ -1127,18 +1134,9 @@ static int libplacebo_query_format(AVFilterContext *ctx) { int err; LibplaceboContext *s = ctx->priv; - const AVVulkanDeviceContext *vkhwctx = NULL; const AVPixFmtDescriptor *desc = NULL; AVFilterFormats *infmts = NULL, *outfmts = NULL; - if (ctx->hw_device_ctx) { - const AVHWDeviceContext *avhwctx = (void *) ctx->hw_device_ctx->data; - if (avhwctx->type == AV_HWDEVICE_TYPE_VULKAN) - vkhwctx = avhwctx->hwctx; - } - - RET(init_vulkan(ctx, vkhwctx)); - while ((desc = av_pix_fmt_desc_next(desc))) { enum AVPixelFormat pixfmt = av_pix_fmt_desc_get_id(desc); @@ -1150,7 +1148,7 @@ static int libplacebo_query_format(AVFilterContext *ctx) #endif if (pixfmt == AV_PIX_FMT_VULKAN) { - if (!vkhwctx || vkhwctx->act_dev != s->vulkan->device) + if (!s->vkctx.hwctx || s->vkctx.hwctx->act_dev != s->vulkan->device) continue; } -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".