avfilter: use av_clip_uintp2_c where clip is variable

Signed-off-by: Paul B Mahol <onemda@gmail.com>
pull/288/head
John Cox 7 years ago committed by Paul B Mahol
parent 1616b1be5a
commit 8d4fc2ea06
  1. 2
      libavfilter/vf_amplify.c
  2. 18
      libavfilter/vf_colorbalance.c
  3. 2
      libavfilter/vf_fftdnoiz.c

@ -186,7 +186,7 @@ static int amplify_frame(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs
} else {
amp = FFMIN(FFABS(diff * factor), hlimit);
}
dst[x] = av_clip_uintp2(src + amp, depth);
dst[x] = av_clip_uintp2_c(src + amp, depth);
} else {
dst[x] = src;
}

@ -297,17 +297,17 @@ static int config_output(AVFilterLink *outlink)
for (i = 0; i < max; i++) {
r = g = b = i;
r = av_clip_uintp2(r + s->cyan_red.shadows * shadows[r], depth);
r = av_clip_uintp2(r + s->cyan_red.midtones * midtones[r], depth);
r = av_clip_uintp2(r + s->cyan_red.highlights * highlights[r], depth);
r = av_clip_uintp2_c(r + s->cyan_red.shadows * shadows[r], depth);
r = av_clip_uintp2_c(r + s->cyan_red.midtones * midtones[r], depth);
r = av_clip_uintp2_c(r + s->cyan_red.highlights * highlights[r], depth);
g = av_clip_uintp2(g + s->magenta_green.shadows * shadows[g], depth);
g = av_clip_uintp2(g + s->magenta_green.midtones * midtones[g], depth);
g = av_clip_uintp2(g + s->magenta_green.highlights * highlights[g], depth);
g = av_clip_uintp2_c(g + s->magenta_green.shadows * shadows[g], depth);
g = av_clip_uintp2_c(g + s->magenta_green.midtones * midtones[g], depth);
g = av_clip_uintp2_c(g + s->magenta_green.highlights * highlights[g], depth);
b = av_clip_uintp2(b + s->yellow_blue.shadows * shadows[b], depth);
b = av_clip_uintp2(b + s->yellow_blue.midtones * midtones[b], depth);
b = av_clip_uintp2(b + s->yellow_blue.highlights * highlights[b], depth);
b = av_clip_uintp2_c(b + s->yellow_blue.shadows * shadows[b], depth);
b = av_clip_uintp2_c(b + s->yellow_blue.midtones * midtones[b], depth);
b = av_clip_uintp2_c(b + s->yellow_blue.highlights * highlights[b], depth);
s->lut[R][i] = r;
s->lut[G][i] = g;

@ -176,7 +176,7 @@ static void export_row16(FFTComplex *src, uint8_t *dstp, int rw, float scale, in
int j;
for (j = 0; j < rw; j++)
dst[j] = av_clip_uintp2(src[j].re * scale, depth);
dst[j] = av_clip_uintp2_c(src[j].re * scale, depth);
}
static int config_input(AVFilterLink *inlink)

Loading…
Cancel
Save