virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avfilter/vf_mix: clip output pixel values

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2018-04-25 13:07:34 +02:00
parent a5172dcab6
commit 330215830e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/vf_mix.c
View File

@@ -44,6 +44,7 @@ typedef struct MixContext {
int nb_frames; int nb_frames;
int depth; int depth;
int max;
int nb_planes; int nb_planes;
int linesize[4]; int linesize[4];
int height[4]; int height[4];
@@ -137,7 +138,7 @@ static void mix_frames(MixContext *s, AVFrame **in, AVFrame *out)
val += src * s->weights[i]; val += src * s->weights[i];
} }
dst[x] = val * s->wfactor; dst[x] = av_clip_uint8(val * s->wfactor);
} }
dst += out->linesize[p]; dst += out->linesize[p];
@@ -157,7 +158,7 @@ static void mix_frames(MixContext *s, AVFrame **in, AVFrame *out)
val += src * s->weights[i]; val += src * s->weights[i];
} }
dst[x] = val * s->wfactor; dst[x] = av_clip(val * s->wfactor, 0, s->max);
} }
dst += out->linesize[p] / 2; dst += out->linesize[p] / 2;
@@ -216,6 +217,7 @@ static int config_output(AVFilterLink *outlink)
return AVERROR_BUG; return AVERROR_BUG;
s->nb_planes = av_pix_fmt_count_planes(outlink->format); s->nb_planes = av_pix_fmt_count_planes(outlink->format);
s->depth = s->desc->comp[0].depth; s->depth = s->desc->comp[0].depth;
s->max = (1 << s->depth) - 1;
if ((ret = av_image_fill_linesizes(s->linesize, inlink->format, inlink->w)) < 0) if ((ret = av_image_fill_linesizes(s->linesize, inlink->format, inlink->w)) < 0)
return ret; return ret;