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 147484C9A3 for ; Sun, 11 Aug 2024 14:42:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A71068D9F7; Sun, 11 Aug 2024 17:42:29 +0300 (EEST) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 165AA68D962 for ; Sun, 11 Aug 2024 17:42:20 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=WKRD6sgp; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 834504DDE for ; Sun, 11 Aug 2024 16:42:19 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id UHxaQ0yh1L5I for ; Sun, 11 Aug 2024 16:42:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1723387338; bh=9lAM7zSsSxgLt5eKRbGOMzDSrEOwruvHwM7bz2kB4+U=; h=From:To:Subject:Date:In-Reply-To:References:From; b=WKRD6sgphyp1vc7rxuy34eNGubkNZ4MEFQ4aHTsbevCNMFX8lCOzZz3jMVWVBn9XM o/+8yhh6q+iKFS7RafPP38gS6yCLHReSokEcXBW7FRj8DMaUO+d6gFBFr8ez9yJ2bb O/o4cvfWYB+PDe9u/NZyleBKE/d+0Kvfvqar5dlbFBtjLpFDero2S358VkfrdxL40R tAWc0tVrQJGjKHpWJLRovT8PU/RpRKAm8u4NGOncGL7I5KdBdtCdzkj1h4TE1JxRxn A568QBf9fyE2D4eVxNFs2FsSmIGYejHZ18j0qC6CBi1J3TwzOfckyWalFsJFhFMgX7 Jj322IpsPb5/w== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 257B94DE2 for ; Sun, 11 Aug 2024 16:42:18 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 090913A1AA4 for ; Sun, 11 Aug 2024 16:42:18 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2024 16:42:05 +0200 Message-ID: <20240811144211.5712-4-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240811144211.5712-1-anton@khirnov.net> References: <20240811144211.5712-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/10] lavfi/vf_*_cuda: do not access hw contexts before checking they exist 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 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: The checks are performed in init_processing_chain(). --- libavfilter/vf_bilateral_cuda.c | 13 ++++++++----- libavfilter/vf_chromakey_cuda.c | 13 ++++++++----- libavfilter/vf_colorspace_cuda.c | 14 ++++++++------ libavfilter/vf_scale_cuda.c | 13 ++++++++----- 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/libavfilter/vf_bilateral_cuda.c b/libavfilter/vf_bilateral_cuda.c index ba008b517a..037227af93 100644 --- a/libavfilter/vf_bilateral_cuda.c +++ b/libavfilter/vf_bilateral_cuda.c @@ -249,17 +249,20 @@ static av_cold int cuda_bilateral_config_props(AVFilterLink *outlink) AVFilterContext *ctx = outlink->src; AVFilterLink *inlink = outlink->src->inputs[0]; CUDABilateralContext *s = ctx->priv; - AVHWFramesContext *frames_ctx = (AVHWFramesContext*)inlink->hw_frames_ctx->data; - AVCUDADeviceContext *device_hwctx = frames_ctx->device_ctx->hwctx; + AVHWFramesContext *frames_ctx; + AVCUDADeviceContext *device_hwctx; int ret; - s->hwctx = device_hwctx; - s->cu_stream = s->hwctx->stream; - ret = init_processing_chain(ctx, inlink->w, inlink->h); if (ret < 0) return ret; + frames_ctx = (AVHWFramesContext*)inlink->hw_frames_ctx->data; + device_hwctx = frames_ctx->device_ctx->hwctx; + + s->hwctx = device_hwctx; + s->cu_stream = s->hwctx->stream; + outlink->sample_aspect_ratio = inlink->sample_aspect_ratio; // the window_size makes more sense when it is odd, so add 1 if even diff --git a/libavfilter/vf_chromakey_cuda.c b/libavfilter/vf_chromakey_cuda.c index ac644caea7..e38521be0d 100644 --- a/libavfilter/vf_chromakey_cuda.c +++ b/libavfilter/vf_chromakey_cuda.c @@ -259,13 +259,10 @@ static av_cold int cudachromakey_config_props(AVFilterLink *outlink) AVFilterContext *ctx = outlink->src; AVFilterLink *inlink = outlink->src->inputs[0]; ChromakeyCUDAContext *s = ctx->priv; - AVHWFramesContext *frames_ctx = (AVHWFramesContext *)inlink->hw_frames_ctx->data; - AVCUDADeviceContext *device_hwctx = frames_ctx->device_ctx->hwctx; + AVHWFramesContext *frames_ctx; + AVCUDADeviceContext *device_hwctx; int ret; - s->hwctx = device_hwctx; - s->cu_stream = s->hwctx->stream; - if (s->is_yuv) { s->chromakey_uv[0] = s->chromakey_rgba[1]; s->chromakey_uv[1] = s->chromakey_rgba[2]; @@ -278,6 +275,12 @@ static av_cold int cudachromakey_config_props(AVFilterLink *outlink) if (ret < 0) return ret; + frames_ctx = (AVHWFramesContext *)inlink->hw_frames_ctx->data; + device_hwctx = frames_ctx->device_ctx->hwctx; + + s->hwctx = device_hwctx; + s->cu_stream = s->hwctx->stream; + outlink->sample_aspect_ratio = inlink->sample_aspect_ratio; ret = cudachromakey_load_functions(ctx); diff --git a/libavfilter/vf_colorspace_cuda.c b/libavfilter/vf_colorspace_cuda.c index 5ad81e959c..3949cb7ed8 100644 --- a/libavfilter/vf_colorspace_cuda.c +++ b/libavfilter/vf_colorspace_cuda.c @@ -226,14 +226,10 @@ static av_cold int cudacolorspace_config_props(AVFilterLink* outlink) AVFilterContext* ctx = outlink->src; AVFilterLink* inlink = outlink->src->inputs[0]; CUDAColorspaceContext* s = ctx->priv; - AVHWFramesContext* frames_ctx = - (AVHWFramesContext*)inlink->hw_frames_ctx->data; - AVCUDADeviceContext* device_hwctx = frames_ctx->device_ctx->hwctx; + AVHWFramesContext* frames_ctx; + AVCUDADeviceContext* device_hwctx; int ret; - s->hwctx = device_hwctx; - s->cu_stream = s->hwctx->stream; - outlink->w = inlink->w; outlink->h = inlink->h; @@ -241,6 +237,12 @@ static av_cold int cudacolorspace_config_props(AVFilterLink* outlink) if (ret < 0) return ret; + frames_ctx = (AVHWFramesContext*)inlink->hw_frames_ctx->data; + device_hwctx = frames_ctx->device_ctx->hwctx; + + s->hwctx = device_hwctx; + s->cu_stream = s->hwctx->stream; + if (inlink->sample_aspect_ratio.num) { outlink->sample_aspect_ratio = av_mul_q( (AVRational){outlink->h * inlink->w, outlink->w * inlink->h}, diff --git a/libavfilter/vf_scale_cuda.c b/libavfilter/vf_scale_cuda.c index 5571a52b1e..68d17072e3 100644 --- a/libavfilter/vf_scale_cuda.c +++ b/libavfilter/vf_scale_cuda.c @@ -349,14 +349,11 @@ static av_cold int cudascale_config_props(AVFilterLink *outlink) AVFilterContext *ctx = outlink->src; AVFilterLink *inlink = outlink->src->inputs[0]; CUDAScaleContext *s = ctx->priv; - AVHWFramesContext *frames_ctx = (AVHWFramesContext*)inlink->hw_frames_ctx->data; - AVCUDADeviceContext *device_hwctx = frames_ctx->device_ctx->hwctx; + AVHWFramesContext *frames_ctx; + AVCUDADeviceContext *device_hwctx; int w, h; int ret; - s->hwctx = device_hwctx; - s->cu_stream = s->hwctx->stream; - if ((ret = ff_scale_eval_dimensions(s, s->w_expr, s->h_expr, inlink, outlink, @@ -377,6 +374,12 @@ static av_cold int cudascale_config_props(AVFilterLink *outlink) if (ret < 0) return ret; + frames_ctx = (AVHWFramesContext*)inlink->hw_frames_ctx->data; + device_hwctx = frames_ctx->device_ctx->hwctx; + + s->hwctx = device_hwctx; + s->cu_stream = s->hwctx->stream; + if (inlink->sample_aspect_ratio.num) { outlink->sample_aspect_ratio = av_mul_q((AVRational){outlink->h*inlink->w, outlink->w*inlink->h}, -- 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".