MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/vf_xfade: fix zx and zy comparison for slide*

Browse Source 
This resulted in the wrong column/row being chosen.
This can be seen best when using xfade on streams with transparency.

For example: in case of a slideleft transition, the first column from
the first input will overwrite the first column of the second stream
throught the transition.
This commit is contained in:
George Floarea 2022-07-12 16:29:33 +02:00 committed by Paul B Mahol
parent eb7ab3928f
commit 9222965fdd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_xfade.c
View File

@ -433,7 +433,7 @@ static void slideleft##name##_transition(AVFilterContext *ctx,
for (int x = 0; x < width; x++) { \
const int zx = z + x; \
const int zz = zx % width + width * (zx < 0); \
dst[x] = (zx > 0) && (zx < width) ? xf1[zz] : xf0[zz]; \
dst[x] = (zx >= 0) && (zx < width) ? xf1[zz] : xf0[zz]; \
} \
\
dst += out->linesize[p] / div; \
@ -466,7 +466,7 @@ static void slideright##name##_transition(AVFilterContext *ctx,
for (int x = 0; x < out->width; x++) { \
const int zx = z + x; \
const int zz = zx % width + width * (zx < 0); \
dst[x] = (zx > 0) && (zx < width) ? xf1[zz] : xf0[zz]; \
dst[x] = (zx >= 0) && (zx < width) ? xf1[zz] : xf0[zz]; \
} \
\
dst += out->linesize[p] / div; \
@ -499,7 +499,7 @@ static void slideup##name##_transition(AVFilterContext *ctx,
const type *xf1 = (const type *)(b->data[p] + zz * b->linesize[p]); \
\
for (int x = 0; x < out->width; x++) { \
dst[x] = (zy > 0) && (zy < height) ? xf1[x] : xf0[x]; \
dst[x] = (zy >= 0) && (zy < height) ? xf1[x] : xf0[x]; \
} \
\
dst += out->linesize[p] / div; \
@ -530,7 +530,7 @@ static void slidedown##name##_transition(AVFilterContext *ctx,
const type *xf1 = (const type *)(b->data[p] + zz * b->linesize[p]); \
\
for (int x = 0; x < out->width; x++) { \
dst[x] = (zy > 0) && (zy < height) ? xf1[x] : xf0[x]; \
dst[x] = (zy >= 0) && (zy < height) ? xf1[x] : xf0[x]; \
} \
\
dst += out->linesize[p] / div; \