har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_delogo: change the definition of logo_x2 and logo_y2

Browse Source 
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>
This commit is contained in:
Jean Delvare 2015-12-18 16:16:38 +01:00 committed by Michael Niedermayer
parent 591b240ed4
commit 47b2ba9878
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavfilter/vf_delogo.c
View File

@ -75,13 +75,13 @@ static void apply_delogo(uint8_t *dst, int dst_linesize,
yclipb = FFMAX(logo_y+logo_h-h, 0); yclipb = FFMAX(logo_y+logo_h-h, 0);
logo_x1 = logo_x + xclipl; 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_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; topleft = src+logo_y1 * src_linesize+logo_x1;
topright = src+logo_y1 * src_linesize+logo_x2-1; topright = src+logo_y1 * src_linesize+logo_x2;
botleft = src+(logo_y2-1) * src_linesize+logo_x1; botleft = src+logo_y2 * src_linesize+logo_x1;
if (!direct) if (!direct)
av_image_copy_plane(dst, dst_linesize, src, src_linesize, w, h); 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; dst += (logo_y1 + 1) * dst_linesize;
src += (logo_y1 + 1) * src_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)] + left_sample = topleft[src_linesize*(y-logo_y1)] +
topleft[src_linesize*(y-logo_y1-1)] + topleft[src_linesize*(y-logo_y1-1)] +
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, for (x = logo_x1+1,
xdst = dst+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 || if (show && (y == logo_y1+1 || y == logo_y2-1 ||
x == logo_x1+1 || x == logo_x2-2)) { x == logo_x1+1 || x == logo_x2-1)) {
*xdst = 0; *xdst = 0;
continue; continue;
} }
/* Weighted interpolation based on relative distances, taking SAR into account */ /* 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; 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-1-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-1-x) * (logo_y2-1-y) * sar.num; weightt = (uint64_t)(x-logo_x1) * (logo_x2-x) * (logo_y2-y) * sar.num;
weightb = (uint64_t)(x-logo_x1) * (logo_x2-1-x) * (y-logo_y1) * sar.num; weightb = (uint64_t)(x-logo_x1) * (logo_x2-x) * (y-logo_y1) * sar.num;
interp = interp =
left_sample * weightl left_sample * weightl