virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avfilter/vf_overlay: Keep dst_step in bytes

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-06-04 20:06:01 +02:00
parent 48427b012d
commit a4b3474de6
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_overlay.c
View File

@ -474,9 +474,7 @@ static av_always_inline void blend_plane_##depth##_##nbits##bits(AVFilterContext
int slice_start, slice_end; \ int slice_start, slice_end; \
const T max = (1 << nbits) - 1; \ const T max = (1 << nbits) - 1; \
const T mid = (1 << (nbits - 1)); \ const T mid = (1 << (nbits - 1)); \
int bytes = depth / 8; \
\ \
dst_step /= bytes; \
j = FFMAX(-yp, 0); \ j = FFMAX(-yp, 0); \
jmax = FFMIN3(-yp + dst_hp, FFMIN(src_hp, dst_hp), yp + src_hp); \ jmax = FFMIN3(-yp + dst_hp, FFMIN(src_hp, dst_hp), yp + src_hp); \
\ \
@ -495,7 +493,7 @@ static av_always_inline void blend_plane_##depth##_##nbits##bits(AVFilterContext
const T *s = (const T *)sp + k; \ const T *s = (const T *)sp + k; \
const T *a = (const T *)ap + (k << hsub); \ const T *a = (const T *)ap + (k << hsub); \
const T *da = main_has_alpha ? (T *)dap + ((xp + k) << hsub) : NULL; \ const T *da = main_has_alpha ? (T *)dap + ((xp + k) << hsub) : NULL; \
T *d = (T *)dp + (xp + k) * dst_step; \ T *d = (T *)(dp + (xp + k) * dst_step); \
kmax = FFMIN(-xp + dst_wp, src_wp); \ kmax = FFMIN(-xp + dst_wp, src_wp); \
\ \
if (nbits == 8 && ((vsub && j+1 < src_hp) || !vsub) && octx->blend_row[i]) { \ if (nbits == 8 && ((vsub && j+1 < src_hp) || !vsub) && octx->blend_row[i]) { \
@ -503,7 +501,7 @@ static av_always_inline void blend_plane_##depth##_##nbits##bits(AVFilterContext
(uint8_t*)a, kmax - k, src->linesize[3]); \ (uint8_t*)a, kmax - k, src->linesize[3]); \
\ \
s += c; \ s += c; \
d += dst_step * c; \ d = PTR_ADD(T, d, dst_step * c); \
if (main_has_alpha) \ if (main_has_alpha) \
da += (1 << hsub) * c; \ da += (1 << hsub) * c; \
a += (1 << hsub) * c; \ a += (1 << hsub) * c; \
@ -564,7 +562,7 @@ static av_always_inline void blend_plane_##depth##_##nbits##bits(AVFilterContext
} \ } \
} \ } \
s++; \ s++; \
d += dst_step; \ d = PTR_ADD(T, d, dst_step); \
if (main_has_alpha) \ if (main_has_alpha) \
da += 1 << hsub; \ da += 1 << hsub; \
a += 1 << hsub; \ a += 1 << hsub; \