RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_colormatrix: fix yuv420p threading, second try 

Now seems to work fine with different combinations of odd/even heights
and odd/even number of threads.
This commit is contained in:
Clément Bœsch 2015-03-18 23:58:30 +01:00
parent b1fbe29e51
commit d2009c77fb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_colormatrix.c
View File

@ -281,10 +281,10 @@ static int process_slice_yuv420p(AVFilterContext *ctx, void *arg, int jobnr, int
const ThreadData *td = arg; const ThreadData *td = arg;
const AVFrame *src = td->src; const AVFrame *src = td->src;
AVFrame *dst = td->dst; AVFrame *dst = td->dst;
const int height = src->height; const int height = FFALIGN(src->height, 2) >> 1;
const int width = src->width; const int width = src->width;
const int slice_start = (height * jobnr ) / nb_jobs; const int slice_start = ((height * jobnr ) / nb_jobs) << 1;
const int slice_end = (height * (jobnr+1)) / nb_jobs; const int slice_end = ((height * (jobnr+1)) / nb_jobs) << 1;
const int src_pitchY = src->linesize[0]; const int src_pitchY = src->linesize[0];
const int src_pitchUV = src->linesize[1]; const int src_pitchUV = src->linesize[1];
const int dst_pitchY = dst->linesize[0]; const int dst_pitchY = dst->linesize[0];
@ -416,7 +416,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
FFMIN(in->height, ctx->graph->nb_threads)); FFMIN(in->height, ctx->graph->nb_threads));
else if (in->format == AV_PIX_FMT_YUV420P) else if (in->format == AV_PIX_FMT_YUV420P)
ctx->internal->execute(ctx, process_slice_yuv420p, &td, NULL, ctx->internal->execute(ctx, process_slice_yuv420p, &td, NULL,
FFMAX(1, FFMIN(in->height, ctx->graph->nb_threads) & ~1)); FFMIN(in->height / 2, ctx->graph->nb_threads));
else else
ctx->internal->execute(ctx, process_slice_uyvy422, &td, NULL, ctx->internal->execute(ctx, process_slice_uyvy422, &td, NULL,
FFMIN(in->height, ctx->graph->nb_threads)); FFMIN(in->height, ctx->graph->nb_threads));