diff options
| author | Jean Delvare <jdelvare@suse.de> | 2015-12-18 16:16:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-19 03:12:31 +0100 |
| commit | 47b2ba98787279a7d952cf7162ff2c25b07831a6 (patch) | |
| tree | a030f3cf532352fa138b04d52ef5601fdbf274f6 /libavfilter/vf_delogo.c | |
| parent | 591b240ed48641e3b72088c5b6e7b2e452b286ca (diff) | |
avfilter/vf_delogo: change the definition of logo_x2 and logo_y2
In the code we keep using logo_x2-1 and logo_y2-1 rather than logo_x2
and logo_y2 themselves. Define them to be what we need instead, to avoid
the repeated subtractions.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/vf_delogo.c')
| -rw-r--r-- | libavfilter/vf_delogo.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c index 8058ea901e..118caa649f 100644 --- a/libavfilter/vf_delogo.c +++ b/libavfilter/vf_delogo.c @@ -75,13 +75,13 @@ static void apply_delogo(uint8_t *dst, int dst_linesize, yclipb = FFMAX(logo_y+logo_h-h, 0); logo_x1 = logo_x + xclipl; - logo_x2 = logo_x + logo_w - xclipr; + logo_x2 = logo_x + logo_w - xclipr - 1; logo_y1 = logo_y + yclipt; - logo_y2 = logo_y + logo_h - yclipb; + logo_y2 = logo_y + logo_h - yclipb - 1; - topleft = src+logo_y1 * src_linesize+logo_x1; - topright = src+logo_y1 * src_linesize+logo_x2-1; - botleft = src+(logo_y2-1) * src_linesize+logo_x1; + topleft = src+logo_y1 * src_linesize+logo_x1; + topright = src+logo_y1 * src_linesize+logo_x2; + botleft = src+logo_y2 * src_linesize+logo_x1; if (!direct) av_image_copy_plane(dst, dst_linesize, src, src_linesize, w, h); @@ -89,7 +89,7 @@ static void apply_delogo(uint8_t *dst, int dst_linesize, dst += (logo_y1 + 1) * dst_linesize; src += (logo_y1 + 1) * src_linesize; - for (y = logo_y1+1; y < logo_y2-1; y++) { + for (y = logo_y1+1; y < logo_y2; y++) { left_sample = topleft[src_linesize*(y-logo_y1)] + topleft[src_linesize*(y-logo_y1-1)] + topleft[src_linesize*(y-logo_y1+1)]; @@ -99,19 +99,19 @@ static void apply_delogo(uint8_t *dst, int dst_linesize, for (x = logo_x1+1, xdst = dst+logo_x1+1, - xsrc = src+logo_x1+1; x < logo_x2-1; x++, xdst++, xsrc++) { + xsrc = src+logo_x1+1; x < logo_x2; x++, xdst++, xsrc++) { - if (show && (y == logo_y1+1 || y == logo_y2-2 || - x == logo_x1+1 || x == logo_x2-2)) { + if (show && (y == logo_y1+1 || y == logo_y2-1 || + x == logo_x1+1 || x == logo_x2-1)) { *xdst = 0; continue; } /* Weighted interpolation based on relative distances, taking SAR into account */ - weightl = (uint64_t) (logo_x2-1-x) * (y-logo_y1) * (logo_y2-1-y) * sar.den; - weightr = (uint64_t)(x-logo_x1) * (y-logo_y1) * (logo_y2-1-y) * sar.den; - weightt = (uint64_t)(x-logo_x1) * (logo_x2-1-x) * (logo_y2-1-y) * sar.num; - weightb = (uint64_t)(x-logo_x1) * (logo_x2-1-x) * (y-logo_y1) * sar.num; + weightl = (uint64_t) (logo_x2-x) * (y-logo_y1) * (logo_y2-y) * sar.den; + weightr = (uint64_t)(x-logo_x1) * (y-logo_y1) * (logo_y2-y) * sar.den; + weightt = (uint64_t)(x-logo_x1) * (logo_x2-x) * (logo_y2-y) * sar.num; + weightb = (uint64_t)(x-logo_x1) * (logo_x2-x) * (y-logo_y1) * sar.num; interp = left_sample * weightl |