avfilter/vf_mix: clip output pixel values
authorPaul B Mahol <onemda@gmail.com>
Wed, 25 Apr 2018 11:07:34 +0000 (13:07 +0200)
committerPaul B Mahol <onemda@gmail.com>
Thu, 26 Apr 2018 14:44:15 +0000 (16:44 +0200)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavfilter/vf_mix.c

index 23385db..7644b71 100644 (file)
@@ -44,6 +44,7 @@ typedef struct MixContext {
     int nb_frames;
 
     int depth;
+    int max;
     int nb_planes;
     int linesize[4];
     int height[4];
@@ -137,7 +138,7 @@ static void mix_frames(MixContext *s, AVFrame **in, AVFrame *out)
                         val += src * s->weights[i];
                     }
 
-                    dst[x] = val * s->wfactor;
+                    dst[x] = av_clip_uint8(val * s->wfactor);
                 }
 
                 dst += out->linesize[p];
@@ -157,7 +158,7 @@ static void mix_frames(MixContext *s, AVFrame **in, AVFrame *out)
                         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;
@@ -216,6 +217,7 @@ static int config_output(AVFilterLink *outlink)
         return AVERROR_BUG;
     s->nb_planes = av_pix_fmt_count_planes(outlink->format);
     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)
         return ret;