fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-01 03:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi/vcn: Make sure JPEG target buffer format matches sampling factor

Browse source 
Reviewed-by: David (Ming Qiang) Wu <David.Wu3@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32504>
This commit is contained in:
David Rosca 2024-11-26 19:33:52 +01:00 • committed by Marge Bot
parent 1a7d956c75
commit 22ced06ee6
1 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/gallium/drivers/radeonsi/radeon_vcn_dec.c
View file

@ -2549,6 +2549,46 @@ static int radeon_dec_end_frame(struct pipe_video_codec *decoder, struct pipe_vi
return 0;
}
static bool radeon_dec_jpeg_check_format(struct radeon_decoder *dec, enum pipe_format format,
unsigned sampling_factor)
{
enum pipe_format expected_format;
switch (sampling_factor) {
case 0x221111:
expected_format = PIPE_FORMAT_NV12;
break;
case 0x211111:
case 0x221212:
case 0x222121:
expected_format = PIPE_FORMAT_YUYV;
break;
case 0x111111:
case 0x222222:
case 0x444444:
expected_format = PIPE_FORMAT_Y8_U8_V8_444_UNORM;
break;
case 0x121111:
expected_format = PIPE_FORMAT_Y8_U8_V8_440_UNORM;
break;
case 0x11:
case 0x44:
expected_format = PIPE_FORMAT_Y8_400_UNORM;
break;
default:
RADEON_DEC_ERR("Unsupported sampling factor 0x%x\n", sampling_factor);
return false;
}
/* Format conversion */
if (format == PIPE_FORMAT_R8G8B8A8_UNORM ||
format == PIPE_FORMAT_A8R8G8B8_UNORM ||
format == PIPE_FORMAT_R8_G8_B8_UNORM)
return true;
return expected_format == format;
}
/**
* end decoding of the current jpeg frame
*/
@ -2560,6 +2600,9 @@ static int radeon_dec_jpeg_end_frame(struct pipe_video_codec *decoder, struct pi
assert(decoder);
if (!radeon_dec_jpeg_check_format(dec, target->buffer_format, pic->picture_parameter.sampling_factor))
RADEON_DEC_ERR("Decode format check failed\n");
if (dec->error)
return 1;