File tree Expand file tree Collapse file tree 4 files changed +32
-21
lines changed Expand file tree Collapse file tree 4 files changed +32
-21
lines changed Original file line number Diff line number Diff line change @@ -249,17 +249,20 @@ static av_cold int cuda_bilateral_config_props(AVFilterLink *outlink)
249
249
AVFilterContext * ctx = outlink -> src ;
250
250
AVFilterLink * inlink = outlink -> src -> inputs [0 ];
251
251
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 ;
254
254
int ret ;
255
255
256
- s -> hwctx = device_hwctx ;
257
- s -> cu_stream = s -> hwctx -> stream ;
258
-
259
256
ret = init_processing_chain (ctx , inlink -> w , inlink -> h );
260
257
if (ret < 0 )
261
258
return ret ;
262
259
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
+
263
266
outlink -> sample_aspect_ratio = inlink -> sample_aspect_ratio ;
264
267
265
268
// the window_size makes more sense when it is odd, so add 1 if even
Original file line number Diff line number Diff line change @@ -259,13 +259,10 @@ static av_cold int cudachromakey_config_props(AVFilterLink *outlink)
259
259
AVFilterContext * ctx = outlink -> src ;
260
260
AVFilterLink * inlink = outlink -> src -> inputs [0 ];
261
261
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 ;
264
264
int ret ;
265
265
266
- s -> hwctx = device_hwctx ;
267
- s -> cu_stream = s -> hwctx -> stream ;
268
-
269
266
if (s -> is_yuv ) {
270
267
s -> chromakey_uv [0 ] = s -> chromakey_rgba [1 ];
271
268
s -> chromakey_uv [1 ] = s -> chromakey_rgba [2 ];
@@ -278,6 +275,12 @@ static av_cold int cudachromakey_config_props(AVFilterLink *outlink)
278
275
if (ret < 0 )
279
276
return ret ;
280
277
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
+
281
284
outlink -> sample_aspect_ratio = inlink -> sample_aspect_ratio ;
282
285
283
286
ret = cudachromakey_load_functions (ctx );
Original file line number Diff line number Diff line change @@ -226,21 +226,23 @@ static av_cold int cudacolorspace_config_props(AVFilterLink* outlink)
226
226
AVFilterContext * ctx = outlink -> src ;
227
227
AVFilterLink * inlink = outlink -> src -> inputs [0 ];
228
228
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 ;
232
231
int ret ;
233
232
234
- s -> hwctx = device_hwctx ;
235
- s -> cu_stream = s -> hwctx -> stream ;
236
-
237
233
outlink -> w = inlink -> w ;
238
234
outlink -> h = inlink -> h ;
239
235
240
236
ret = init_processing_chain (ctx , inlink -> w , inlink -> h );
241
237
if (ret < 0 )
242
238
return ret ;
243
239
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
+
244
246
if (inlink -> sample_aspect_ratio .num ) {
245
247
outlink -> sample_aspect_ratio = av_mul_q (
246
248
(AVRational ){outlink -> h * inlink -> w , outlink -> w * inlink -> h },
Original file line number Diff line number Diff line change @@ -349,14 +349,11 @@ static av_cold int cudascale_config_props(AVFilterLink *outlink)
349
349
AVFilterContext * ctx = outlink -> src ;
350
350
AVFilterLink * inlink = outlink -> src -> inputs [0 ];
351
351
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 ;
354
354
int w , h ;
355
355
int ret ;
356
356
357
- s -> hwctx = device_hwctx ;
358
- s -> cu_stream = s -> hwctx -> stream ;
359
-
360
357
if ((ret = ff_scale_eval_dimensions (s ,
361
358
s -> w_expr , s -> h_expr ,
362
359
inlink , outlink ,
@@ -377,6 +374,12 @@ static av_cold int cudascale_config_props(AVFilterLink *outlink)
377
374
if (ret < 0 )
378
375
return ret ;
379
376
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
+
380
383
if (inlink -> sample_aspect_ratio .num ) {
381
384
outlink -> sample_aspect_ratio = av_mul_q ((AVRational ){outlink -> h * inlink -> w ,
382
385
outlink -> w * inlink -> h },
You can’t perform that action at this time.
0 commit comments