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

swscale/unscaled: fix rgbToRgbWrapper for YUVX

Browse Source 
This code calculates the pixel step using c->dstFormatBpp, which is wrong;
should use the pixdesc step instead. (dstFormatBpp is 3 for YUVX, but
the actual pixel step is 4 bytes)

This bug was mostly hidden by the fact that the same bug actually disabled
the fast path for the (common) case of strStride == dstStride. Uncovered while
making changes to the swscale.c allocation code.

Reproduced by modifying libswscale in such a way that the dst buffer stride
happened to be exactly 4/3 larger than the src buffer stride, e.g. by adding
extra padding to each dst buffer line, but reproducible in principle by any
API user.

Signed-off-by: Niklas Haas <git@haasn.dev>
This commit is contained in:
Niklas Haas
2026-02-24 19:01:05 +01:00
committed by Niklas Haas
parent a22189101b
commit 5fa2a65c11
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libswscale/swscale_unscaled.c
+4 -4
View File
@@ -1994,8 +1994,8 @@ static int rgbToRgbWrapper(SwsInternal *c, const uint8_t *const src[], const int
const enum AVPixelFormat dstFormat = c->opts.dst_format;
const AVPixFmtDescriptor *desc_src = av_pix_fmt_desc_get(c->opts.src_format);
const AVPixFmtDescriptor *desc_dst = av_pix_fmt_desc_get(c->opts.dst_format);
const int srcBpp = (c->srcFormatBpp + 7) >> 3;
const int dstBpp = (c->dstFormatBpp + 7) >> 3;
const int srcBpp = desc_src->comp[0].step;
const int dstBpp = desc_dst->comp[0].step;
rgbConvFn conv = findRgbConvFn(c);
if (!conv) {
@@ -2004,8 +2004,8 @@ static int rgbToRgbWrapper(SwsInternal *c, const uint8_t *const src[], const int
} else {
const uint8_t *srcPtr = src[0];
uint8_t *dstPtr = dst[0];
int src_bswap = IS_NOT_NE(c->srcFormatBpp, desc_src);
int dst_bswap = IS_NOT_NE(c->dstFormatBpp, desc_dst);
int src_bswap = IS_NOT_NE(srcBpp, desc_src);
int dst_bswap = IS_NOT_NE(dstBpp, desc_dst);
if ((srcFormat == AV_PIX_FMT_RGB32_1 || srcFormat == AV_PIX_FMT_BGR32_1) &&
!isRGBA32(dstFormat))