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

swscale/swscale_unscaled: fix packed16togbra16() for formats with bpc between 9-14 bits

Browse Source 
Currently, packed16togbra16() always sets the alpha value to 0xFFFF,
without taking the bit depth into consideration.

This causes a bug on x86, which can be reproduced with:
./libswscale/tests/swscale -unscaled 1 -src xyz12le -dst gbrap12be

The problem arises in ff_hscale14to15_4_ssse3(), in the conversion
from gbrap12be to yuva444p, which comes after the conversion from
xyz12le to gbrap12be.

It has something to do with pmaddwd not working on unsigned values.
There is some code to deal with 0xFFFF if the input has a bit depth of
16, but not for bit depths < 16.
We could fix ff_hscale14to15_4_ssse3() to also work correctly with
0xFFFF on bit depths < 16, or we could just not write 0xFFFF there in
the first place, which is what this commit does.
This commit is contained in:
Ramiro Polla
2025-05-18 22:52:09 +02:00
parent 0c1d87d1e6
commit 748e960e04
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libswscale/swscale_unscaled.c
View File

@ -699,7 +699,7 @@ static void packed16togbra16(const uint8_t *src, int srcStride,
dst[0][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
dst[1][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
dst[2][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
dst[3][x] = 0xFFFF;
dst[3][x] = av_bswap16(0xFFFF >> shift);
}
} else if (src_alpha) {
for (x = 0; x < width; x++) {
@ -729,7 +729,7 @@ static void packed16togbra16(const uint8_t *src, int srcStride,
dst[0][x] = av_bswap16(*src_line++ >> shift);
dst[1][x] = av_bswap16(*src_line++ >> shift);
dst[2][x] = av_bswap16(*src_line++ >> shift);
dst[3][x] = 0xFFFF;
dst[3][x] = av_bswap16(0xFFFF >> shift);
}
} else if (src_alpha) {
for (x = 0; x < width; x++) {
@ -759,7 +759,7 @@ static void packed16togbra16(const uint8_t *src, int srcStride,
dst[0][x] = av_bswap16(*src_line++) >> shift;
dst[1][x] = av_bswap16(*src_line++) >> shift;
dst[2][x] = av_bswap16(*src_line++) >> shift;
dst[3][x] = 0xFFFF;
dst[3][x] = 0xFFFF >> shift;
}
} else if (src_alpha) {
for (x = 0; x < width; x++) {
@ -789,7 +789,7 @@ static void packed16togbra16(const uint8_t *src, int srcStride,
dst[0][x] = *src_line++ >> shift;
dst[1][x] = *src_line++ >> shift;
dst[2][x] = *src_line++ >> shift;
dst[3][x] = 0xFFFF;
dst[3][x] = 0xFFFF >> shift;
}
} else if (src_alpha) {
for (x = 0; x < width; x++) {