highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_geq: fix interpolation with 1 pixel width/height

Browse Source 
Fixes ticket #9740.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2024-05-09 00:17:53 +02:00
parent 64330e365b
commit b0093ab8a3
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavfilter/vf_geq.c
View File

@ -112,8 +112,12 @@ static inline double getpix(void *priv, double x, double y, int plane)
return 0; return 0;
if (geq->interpolation == INTERP_BILINEAR) { if (geq->interpolation == INTERP_BILINEAR) {
xi = x = av_clipd(x, 0, w - 2); int xn, yn;
yi = y = av_clipd(y, 0, h - 2);
xi = x = av_clipd(x, 0, w - 1);
yi = y = av_clipd(y, 0, h - 1);
xn = FFMIN(xi + 1, w - 1);
yn = FFMIN(yi + 1, h - 1);
x -= xi; x -= xi;
y -= yi; y -= yi;
@ -122,17 +126,17 @@ static inline double getpix(void *priv, double x, double y, int plane)
const uint16_t *src16 = (const uint16_t*)src; const uint16_t *src16 = (const uint16_t*)src;
linesize /= 2; linesize /= 2;
return (1-y)*((1-x)*src16[xi + yi * linesize] + x*src16[xi + 1 + yi * linesize]) return (1-y)*((1-x)*src16[xi + yi * linesize] + x*src16[xn + yi * linesize])
+ y *((1-x)*src16[xi + (yi+1) * linesize] + x*src16[xi + 1 + (yi+1) * linesize]); + y *((1-x)*src16[xi + yn * linesize] + x*src16[xn + yn * linesize]);
} else if (geq->bps == 32) { } else if (geq->bps == 32) {
const float *src32 = (const float*)src; const float *src32 = (const float*)src;
linesize /= 4; linesize /= 4;
return (1-y)*((1-x)*src32[xi + yi * linesize] + x*src32[xi + 1 + yi * linesize]) return (1-y)*((1-x)*src32[xi + yi * linesize] + x*src32[xn + yi * linesize])
+ y *((1-x)*src32[xi + (yi+1) * linesize] + x*src32[xi + 1 + (yi+1) * linesize]); + y *((1-x)*src32[xi + yn * linesize] + x*src32[xn + yn * linesize]);
} else if (geq->bps == 8) { } else if (geq->bps == 8) {
return (1-y)*((1-x)*src[xi + yi * linesize] + x*src[xi + 1 + yi * linesize]) return (1-y)*((1-x)*src[xi + yi * linesize] + x*src[xn + yi * linesize])
+ y *((1-x)*src[xi + (yi+1) * linesize] + x*src[xi + 1 + (yi+1) * linesize]); + y *((1-x)*src[xi + yn * linesize] + x*src[xn + yn * linesize]);
} }
} else { } else {
xi = av_clipd(x, 0, w - 1); xi = av_clipd(x, 0, w - 1);