virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavfi/lensfun: Use ff_filter_get_nb_threads() get number of threads

Browse Source 
ff_filter_get_nb_threads() respect AVFilterContext.nb_threads and
graph->nb_threads both, in most case, we perfer this API than using
ctx->graph->nb_threads directly.

Reviewed-by: Steven Liu <lq@onvideo.cn>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
This commit is contained in:
Jun Zhao 2019-05-22 09:41:56 +08:00
parent ecc096513c
commit 98663a0bb8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/vf_lensfun.c
View File

@ -465,7 +465,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
vignetting_filter_slice, vignetting_filter_slice,
&vignetting_thread_data, &vignetting_thread_data,
NULL, NULL,
FFMIN(outlink->h, ctx->graph->nb_threads)); FFMIN(outlink->h, ff_filter_get_nb_threads(ctx)));
} }
if (lensfun->mode & (GEOMETRY_DISTORTION | SUBPIXEL_DISTORTION)) { if (lensfun->mode & (GEOMETRY_DISTORTION | SUBPIXEL_DISTORTION)) {
@ -493,7 +493,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
distortion_correction_filter_slice, distortion_correction_filter_slice,
&distortion_correction_thread_data, &distortion_correction_thread_data,
NULL, NULL,
FFMIN(outlink->h, ctx->graph->nb_threads)); FFMIN(outlink->h, ff_filter_get_nb_threads(ctx)));
av_frame_free(&in); av_frame_free(&in);
return ff_filter_frame(outlink, out); return ff_filter_frame(outlink, out);