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

avfilter/x86/vf_colordetect: fix alpha detect tail handling

Browse Source 
This wrapping logic still considered any nonzero return from the ASM function
to be the overall result, but this is not true since the addition of
FF_ALPHA_TRANSPARENT.

Fix it by only early returning if FF_ALPHA_STRAIGHT is detected.

Fixes: 9b8b78a815
See-Also: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20301#issuecomment-4802
This commit is contained in:
Niklas Haas
2025-09-01 16:39:00 +02:00
committed by Niklas Haas
parent 9dc79241d9
commit f07c12d806
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/x86/vf_colordetect_init.c
View File

@@ -31,11 +31,11 @@ static int FUNC_NAME(const uint8_t *src, ptrdiff_t stride,
{ \
ptrdiff_t bytes = (width << SHIFT) & ~(MMSIZE - 1); \
int ret = ASM_FUNC_NAME(src, stride, bytes, height, min, max); \
if (ret) \
if (ret == FF_ALPHA_STRAIGHT) \
return ret; \
\
return C_FUNC_NAME(src + bytes, stride, width - (bytes >> SHIFT), \
height, min, max); \
return ret | C_FUNC_NAME(src + bytes, stride, width - (bytes >> SHIFT), \
height, min, max); \
}
#define DETECT_ALPHA_FUNC(FUNC_NAME, ASM_FUNC_NAME, C_FUNC_NAME, SHIFT, MMSIZE) \
@@ -50,11 +50,12 @@ static int FUNC_NAME(const uint8_t *color, ptrdiff_t color_stride,
ptrdiff_t bytes = (width << SHIFT) & ~(MMSIZE - 1); \
int ret = ASM_FUNC_NAME(color, color_stride, alpha, alpha_stride, \
bytes, height, p, q, k); \
if (ret) \
if (ret == FF_ALPHA_STRAIGHT) \
return ret; \
\
return C_FUNC_NAME(color + bytes, color_stride, alpha + bytes, alpha_stride,\
width - (bytes >> SHIFT), height, p, q, k); \
return ret | C_FUNC_NAME(color + bytes, color_stride, alpha + bytes, \
alpha_stride, width - (bytes >> SHIFT), height, \
p, q, k); \
}
#if HAVE_X86ASM