From patchwork Fri Feb 9 14:53:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 46137 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:a586:b0:19e:8a94:b663 with SMTP id gd6csp982363pzc; Fri, 9 Feb 2024 06:54:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IGJy+nVssKKE0TIJV215mFWXQMywh+Qqkcv4S14sSqMYrupYwWmUdamoMnsuu5P6Zp/2FY8 X-Received: by 2002:a17:906:301b:b0:a38:916e:a503 with SMTP id 27-20020a170906301b00b00a38916ea503mr1290904ejz.1.1707490473422; Fri, 09 Feb 2024 06:54:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707490473; cv=none; d=google.com; s=arc-20160816; b=a/7v8k+qRWz+v53CzlvWrzJoXudGZBfxmZYkA4NbeVacgYKlInwxs+A/8F7hiADmUj p/cVZJbt6w1HgSz4mfXHG7jgtua1ZF4vmToifFzFfGYqpLylQJaDiClBdIUNwt9ZU+AF qxdWMJ368JMcEwRi4LgYC6onugSLqw4hhbUY+Xf7prumYG4ohMdM0TZ9QHOZa+gIk4Ys x6tjW3uS58aS1qY5Usj6tZgV2cVQgJofIA6AGLvdvE4tzj7ZaEQZiXnqFGj2wcTPvIYu NvvFqW2YOe+tt3hSC+iDynnHNA2TCuunA9sm//9RLSYJeK1cE1RjMN9o9UXY6DGRDv8U 6ShQ== 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=7tJXaMUjP58G1JeB9f8zYhI/Z1N6fLIrtubgr/liCxs=; fh=1P28kNUzmGDAgZXaHemmChcSrNOCOwMW0G3MWey7xis=; b=AAkHpcTDQo2U1ak48JMCETxGBeOh+3Ffp3puPtPwV9V4ImR5JUIPum1ZDpF8e2R4/b HrwLvah6dC9vm54TgF/+NVUv8y1yC4pwKY5PnuOnevtE9amgROHLJSSpxMuFfyZ2qnJN H+bihjzLXoENaqRWu62uCVdZQsRZfhvPvkHQer815DeXUGo48h0DAfAOCqmg94vaDysX QGXZlZRC247rAS8fXPFdfpGKR3psZiHCbvmmDhVXmSpTrwGYNudRLqHIRs7+e79lsrNW +marGXCsloFkvKNBcoaKbr7UjWd9qyAy4XlBmmxVRbbLp5c+GxgjPthVbY/UHZiXqcjG WDnQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=j+mGty5n; 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 X-Forwarded-Encrypted: i=1; AJvYcCXU8nkuOXwU9oSrc6xddm2ttgM518+d0nl+U49In8044lgx9KYh9RfF8A37gvWNX7NOpJ1W7WFkXhAsAI1P9FnUgak/12Ij0CZXh5191oCsPkQc8awvluoPuaquSHboVOEUDe0A3KacRhW2cjHi3mz5hoob8sbc0tqxGkOBrvYd8vvzLSFAfXhSh/WWsfLbhz5A0kgQZfuyl60uSazBFHQgq0fRl6dgeNb+VZkdquxcvXTLa9LwUl6v36nNjqPC3zcbhobGLMHENN8TYLjhGYecx2hvCz7sMYGvm6bXOS0ll2QrrdcHYuhv9MqwsPBXkbkvvnArpIui+tCWMEEJ5/RL5wuDbqZdaDWHdE7exIWri9XQO3XLV9fFVWhlJaqTkaWMx+mZ2hzYlsXIq6Rp7+KSFFPkdIOsjR+mFjJUnn5xZQJJPuCq/i5l7xN4ze8l8pU3iZzy4jY3904/fM+PE2nc2UubApVVIUgaCzSLKwiSi2NJH0ctyNBdcdvN2UCQY9KSFh+P7JnnSsxbTE0ne/eh7VTT5QYjKLls1ck7mE/hJfUkwjGw2QOHD0DYoIyYe+cT9580oI7bjUe4mkAngz63VHNfmGEtkfQsfit1jgc0PGjFTHgATaAXXXt2O3qmSXrWilf268NoTWNhy84zBBRnmN5WkWhKSGsoILLrk5KePXr+/F1osUOr3IiPW+Z6RSwlDCE3yruxcNX7W1P6haEeh3PDvMJnPo916wd553kNp0nVJEKHkl1FK7uCwkYjEQkmHFGYQ3luSaBZK1TY5GXFGJZphsNCmscuWfh3SCgXSkQmHfDAv7/N0bolWrAFn1FTSmGBdQwTJaF8isMntEgUVwrrzCo2Qo0hU6V/IZdm2aczGVU2rOHCTvyGjWY6niFB3Dw3RKouhqJ06oLUdf6IAWOMpe7ikH0o9ommFfGilSJHcfB5ou/1VET8K/CV4ym0z8 KvJvSIa2XgeqOiiN6f8twUsl8Svqg0UftAKGMbDQdeLGeCNnrz1GsicoecGGl+8KbLEFG/y37e6KkgJn1UomfYu5PVj0gx9pcSQTzDgCtddCbUYVGLODKEKQs/fVqiPtnXEYY6tNfLrWNtiLDp1IH8TNxyvanj0ccvG0QWVR2n9Yja3NYrE9YV+gC6wNiOSL8IZkHKN4NidwPyCdcBHjvTRqtIDQp5MVaP/6n2yufQsOLp8LZWsUKxZy7WywHW1rQsUfwh1KDH9QXpp/CmZA2rh1Fle4zgYi6xwySafFmSI4k1RN86qbmYYNzdLyQ1roG5prjXAlREh+IC3v4U4o1nN9eJubIdIZnyGAOTN4AuPeUYrFv58S9Ke/rQ56dB3GCYCWvG8XaLNHwfPywccfR3WxIh86/qrhEYi6cO511GHK+NaQUscm2wuVv75mEjQHhzm62OCrX3w8HchJxZAyh9ob6kea93IU1EZO57tcitUde8dfDW9eO0Uxq6XHGXLSCLv2BF+LwAs3RT3wF5mWaTeGdoLeXRQQa2hv7IoPRDwzhY5T8ZlWyWnx25Rq2n7nesYP8IYzWWyaal274Ef6XwtHNy5g== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g5-20020a1709063b0500b00a394e84ddcfsi901108ejf.160.2024.02.09.06.54.33; Fri, 09 Feb 2024 06:54:33 -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=j+mGty5n; 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 411C368CAFA; Fri, 9 Feb 2024 16:54:05 +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 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: U/LW4liUlWTb 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; }