OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frontends/va: Create surfaces with correct fourcc for RT format

Browse Source 
If applications doesn't send any attributes to describe the format,
we would always use driver preferred format (NV12). This is wrong
for any RT format other than the driver preferred (YUV420).
Driver doesn't have a choice here, we must use the matching format.

Cc: mesa-stable
Reviewed-by: Leo Liu <leo.liu@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32089>
This commit is contained in:
David Rosca
2024-11-13 12:19:44 +01:00
committed by Marge Bot
parent f70ecba49a
commit c8a893becd
1 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/gallium/frontends/va/surface.c
View File

@@ -1069,6 +1069,31 @@ vlVaGetSurfaceBuffer(vlVaDriver *drv, vlVaSurface *surface)
return surface->buffer;
}
static int
rt_format_to_fourcc(uint32_t format)
{
switch (format) {
case VA_RT_FORMAT_YUV420:
return VA_FOURCC_NV12;
case VA_RT_FORMAT_YUV420_10:
return VA_FOURCC_P010;
case VA_RT_FORMAT_YUV422:
return VA_FOURCC_YUY2;
case VA_RT_FORMAT_YUV444:
return VA_FOURCC_444P;
case VA_RT_FORMAT_YUV400:
return VA_FOURCC_Y800;
case VA_RT_FORMAT_RGBP:
return VA_FOURCC_RGBP;
case VA_RT_FORMAT_RGB32:
return VA_FOURCC_BGRA;
case VA_RT_FORMAT_RGB32_10:
return VA_FOURCC('A','B','3','0');
default:
return 0;
}
}
VAStatus
vlVaCreateSurfaces2(VADriverContextP ctx, unsigned int format,
unsigned int width, unsigned int height,
@@ -1119,6 +1144,13 @@ vlVaCreateSurfaces2(VADriverContextP ctx, unsigned int format,
modifiers = NULL;
modifiers_count = 0;
protected = format & VA_RT_FORMAT_PROTECTED;
format &= ~VA_RT_FORMAT_PROTECTED;
expected_fourcc = rt_format_to_fourcc(format);
if (!expected_fourcc)
return VA_STATUS_ERROR_UNSUPPORTED_RT_FORMAT;
for (i = 0; i < num_attribs && attrib_list; i++) {
if (!(attrib_list[i].flags & VA_SURFACE_ATTRIB_SETTABLE))
continue;
@@ -1185,20 +1217,6 @@ vlVaCreateSurfaces2(VADriverContextP ctx, unsigned int format,
}
}
protected = format & VA_RT_FORMAT_PROTECTED;
format &= ~VA_RT_FORMAT_PROTECTED;
if (VA_RT_FORMAT_YUV420 != format &&
VA_RT_FORMAT_YUV422 != format &&
VA_RT_FORMAT_YUV444 != format &&
VA_RT_FORMAT_YUV400 != format &&
VA_RT_FORMAT_YUV420_10BPP != format &&
VA_RT_FORMAT_RGBP != format &&
VA_RT_FORMAT_RGB32 != format &&
VA_RT_FORMAT_RGB32_10 != format) {
return VA_STATUS_ERROR_UNSUPPORTED_RT_FORMAT;
}
switch (memory_type) {
case VA_SURFACE_ATTRIB_MEM_TYPE_VA:
break;
@@ -1230,34 +1248,20 @@ vlVaCreateSurfaces2(VADriverContextP ctx, unsigned int format,
memset(&templat, 0, sizeof(templat));
templat.buffer_format = pscreen->get_video_param(
pscreen,
PIPE_VIDEO_PROFILE_UNKNOWN,
PIPE_VIDEO_ENTRYPOINT_BITSTREAM,
PIPE_VIDEO_CAP_PREFERED_FORMAT
);
if (modifiers)
templat.interlaced = false;
else
if (!modifiers)
templat.interlaced =
pscreen->get_video_param(pscreen, PIPE_VIDEO_PROFILE_UNKNOWN,
PIPE_VIDEO_ENTRYPOINT_BITSTREAM,
PIPE_VIDEO_CAP_PREFERS_INTERLACED);
if (expected_fourcc) {
enum pipe_format expected_format = VaFourccToPipeFormat(expected_fourcc);
#ifndef _WIN32
if (expected_format != templat.buffer_format || memory_attribute || prime_desc)
if (expected_fourcc != VA_FOURCC_NV12 || memory_attribute || prime_desc)
#else
if (expected_format != templat.buffer_format || memory_attribute)
if (expected_fourcc != VA_FOURCC_NV12 || memory_attribute)
#endif
templat.interlaced = 0;
templat.buffer_format = expected_format;
}
templat.interlaced = false;
templat.buffer_format = VaFourccToPipeFormat(expected_fourcc);
templat.width = width;
templat.height = height;
if (protected)