Skip to content

Commit ce24b5b

Browse files
committed
lavfi/vf_*_cuda: do not access hw contexts before checking they exist
The checks are performed in init_processing_chain().
1 parent 99ee7a9 commit ce24b5b

File tree

4 files changed

+32
-21
lines changed

4 files changed

+32
-21
lines changed

libavfilter/vf_bilateral_cuda.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,17 +249,20 @@ static av_cold int cuda_bilateral_config_props(AVFilterLink *outlink)
249249
AVFilterContext *ctx = outlink->src;
250250
AVFilterLink *inlink = outlink->src->inputs[0];
251251
CUDABilateralContext *s = ctx->priv;
252-
AVHWFramesContext *frames_ctx = (AVHWFramesContext*)inlink->hw_frames_ctx->data;
253-
AVCUDADeviceContext *device_hwctx = frames_ctx->device_ctx->hwctx;
252+
AVHWFramesContext *frames_ctx;
253+
AVCUDADeviceContext *device_hwctx;
254254
int ret;
255255

256-
s->hwctx = device_hwctx;
257-
s->cu_stream = s->hwctx->stream;
258-
259256
ret = init_processing_chain(ctx, inlink->w, inlink->h);
260257
if (ret < 0)
261258
return ret;
262259

260+
frames_ctx = (AVHWFramesContext*)inlink->hw_frames_ctx->data;
261+
device_hwctx = frames_ctx->device_ctx->hwctx;
262+
263+
s->hwctx = device_hwctx;
264+
s->cu_stream = s->hwctx->stream;
265+
263266
outlink->sample_aspect_ratio = inlink->sample_aspect_ratio;
264267

265268
// the window_size makes more sense when it is odd, so add 1 if even

libavfilter/vf_chromakey_cuda.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,10 @@ static av_cold int cudachromakey_config_props(AVFilterLink *outlink)
259259
AVFilterContext *ctx = outlink->src;
260260
AVFilterLink *inlink = outlink->src->inputs[0];
261261
ChromakeyCUDAContext *s = ctx->priv;
262-
AVHWFramesContext *frames_ctx = (AVHWFramesContext *)inlink->hw_frames_ctx->data;
263-
AVCUDADeviceContext *device_hwctx = frames_ctx->device_ctx->hwctx;
262+
AVHWFramesContext *frames_ctx;
263+
AVCUDADeviceContext *device_hwctx;
264264
int ret;
265265

266-
s->hwctx = device_hwctx;
267-
s->cu_stream = s->hwctx->stream;
268-
269266
if (s->is_yuv) {
270267
s->chromakey_uv[0] = s->chromakey_rgba[1];
271268
s->chromakey_uv[1] = s->chromakey_rgba[2];
@@ -278,6 +275,12 @@ static av_cold int cudachromakey_config_props(AVFilterLink *outlink)
278275
if (ret < 0)
279276
return ret;
280277

278+
frames_ctx = (AVHWFramesContext *)inlink->hw_frames_ctx->data;
279+
device_hwctx = frames_ctx->device_ctx->hwctx;
280+
281+
s->hwctx = device_hwctx;
282+
s->cu_stream = s->hwctx->stream;
283+
281284
outlink->sample_aspect_ratio = inlink->sample_aspect_ratio;
282285

283286
ret = cudachromakey_load_functions(ctx);

libavfilter/vf_colorspace_cuda.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,21 +226,23 @@ static av_cold int cudacolorspace_config_props(AVFilterLink* outlink)
226226
AVFilterContext* ctx = outlink->src;
227227
AVFilterLink* inlink = outlink->src->inputs[0];
228228
CUDAColorspaceContext* s = ctx->priv;
229-
AVHWFramesContext* frames_ctx =
230-
(AVHWFramesContext*)inlink->hw_frames_ctx->data;
231-
AVCUDADeviceContext* device_hwctx = frames_ctx->device_ctx->hwctx;
229+
AVHWFramesContext* frames_ctx;
230+
AVCUDADeviceContext* device_hwctx;
232231
int ret;
233232

234-
s->hwctx = device_hwctx;
235-
s->cu_stream = s->hwctx->stream;
236-
237233
outlink->w = inlink->w;
238234
outlink->h = inlink->h;
239235

240236
ret = init_processing_chain(ctx, inlink->w, inlink->h);
241237
if (ret < 0)
242238
return ret;
243239

240+
frames_ctx = (AVHWFramesContext*)inlink->hw_frames_ctx->data;
241+
device_hwctx = frames_ctx->device_ctx->hwctx;
242+
243+
s->hwctx = device_hwctx;
244+
s->cu_stream = s->hwctx->stream;
245+
244246
if (inlink->sample_aspect_ratio.num) {
245247
outlink->sample_aspect_ratio = av_mul_q(
246248
(AVRational){outlink->h * inlink->w, outlink->w * inlink->h},

libavfilter/vf_scale_cuda.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -349,14 +349,11 @@ static av_cold int cudascale_config_props(AVFilterLink *outlink)
349349
AVFilterContext *ctx = outlink->src;
350350
AVFilterLink *inlink = outlink->src->inputs[0];
351351
CUDAScaleContext *s = ctx->priv;
352-
AVHWFramesContext *frames_ctx = (AVHWFramesContext*)inlink->hw_frames_ctx->data;
353-
AVCUDADeviceContext *device_hwctx = frames_ctx->device_ctx->hwctx;
352+
AVHWFramesContext *frames_ctx;
353+
AVCUDADeviceContext *device_hwctx;
354354
int w, h;
355355
int ret;
356356

357-
s->hwctx = device_hwctx;
358-
s->cu_stream = s->hwctx->stream;
359-
360357
if ((ret = ff_scale_eval_dimensions(s,
361358
s->w_expr, s->h_expr,
362359
inlink, outlink,
@@ -377,6 +374,12 @@ static av_cold int cudascale_config_props(AVFilterLink *outlink)
377374
if (ret < 0)
378375
return ret;
379376

377+
frames_ctx = (AVHWFramesContext*)inlink->hw_frames_ctx->data;
378+
device_hwctx = frames_ctx->device_ctx->hwctx;
379+
380+
s->hwctx = device_hwctx;
381+
s->cu_stream = s->hwctx->stream;
382+
380383
if (inlink->sample_aspect_ratio.num) {
381384
outlink->sample_aspect_ratio = av_mul_q((AVRational){outlink->h*inlink->w,
382385
outlink->w*inlink->h},

0 commit comments

Comments
 (0)