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

avfilter/vf_zscale: dissallow too small slices

Browse Source 
Also change rounding type when calculating slices size.
This commit is contained in:
Paul B Mahol 2022-06-16 09:53:50 +02:00
parent afc7679c89
commit 42289d5eaf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/vf_zscale.c
View File

@ -45,6 +45,7 @@
#include "libavutil/imgutils.h"
#define ZIMG_ALIGNMENT 64
#define MIN_TILESIZE 64
#define MAX_THREADS 64
static const char *const var_names[] = {
@ -234,7 +235,7 @@ static void slice_params(ZScaleContext *s, int out_h, int in_h)
{
int slice_size;
slice_size = (out_h + s->nb_threads - 1) / s->nb_threads;
slice_size = (out_h + (s->nb_threads / 2)) / s->nb_threads;
if (slice_size % 2)
slice_size += 1;
s->out_slice_start[0] = 0;
@ -829,7 +830,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
link->dst->inputs[0]->w = in->width;
link->dst->inputs[0]->h = in->height;
s->nb_threads = av_clip(FFMIN(ff_filter_get_nb_threads(ctx), FFMIN(link->h, outlink->h) / 8), 1, MAX_THREADS);
s->nb_threads = av_clip(FFMIN(ff_filter_get_nb_threads(ctx), FFMIN(link->h, outlink->h) / MIN_TILESIZE), 1, MAX_THREADS);
s->in_colorspace = in->colorspace;
s->in_trc = in->color_trc;
s->in_primaries = in->color_primaries;