fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 18:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/va: Support YUV formats in vaCreateSurfaces

Browse source 
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
This commit is contained in:
Drew Davenport 2018-04-27 09:34:58 -06:00 • committed by Kristian H. Kristensen
parent 7cf284f18e
commit 4373dd3215
1 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/gallium/state_trackers/va/surface.c
View file

@ -531,10 +531,12 @@ surface_from_external_memory(VADriverContextP ctx, vlVaSurface *surface,
{ {
vlVaDriver *drv; vlVaDriver *drv;
struct pipe_screen *pscreen; struct pipe_screen *pscreen;
struct pipe_resource *resource;
struct pipe_resource res_templ; struct pipe_resource res_templ;
struct winsys_handle whandle; struct winsys_handle whandle;
struct pipe_resource *resources[VL_NUM_COMPONENTS]; struct pipe_resource *resources[VL_NUM_COMPONENTS];
const enum pipe_format *resource_formats = NULL;
VAStatus result;
int i;
pscreen = VL_VA_PSCREEN(ctx); pscreen = VL_VA_PSCREEN(ctx);
drv = VL_VA_DRIVER(ctx); drv = VL_VA_DRIVER(ctx);
@ -548,17 +550,12 @@ surface_from_external_memory(VADriverContextP ctx, vlVaSurface *surface,
memory_attribute->num_planes < 1) memory_attribute->num_planes < 1)
return VA_STATUS_ERROR_INVALID_PARAMETER; return VA_STATUS_ERROR_INVALID_PARAMETER;
switch (memory_attribute->pixel_format) { if (memory_attribute->num_planes > VL_NUM_COMPONENTS)
case VA_FOURCC_RGBA: return VA_STATUS_ERROR_INVALID_PARAMETER;
case VA_FOURCC_RGBX:
case VA_FOURCC_BGRA: resource_formats = vl_video_buffer_formats(pscreen, templat->buffer_format);
case VA_FOURCC_BGRX: if (!resource_formats)
if (memory_attribute->num_planes != 1)
return VA_STATUS_ERROR_INVALID_PARAMETER;
break;
default:
return VA_STATUS_ERROR_INVALID_PARAMETER; return VA_STATUS_ERROR_INVALID_PARAMETER;
}
memset(&res_templ, 0, sizeof(res_templ)); memset(&res_templ, 0, sizeof(res_templ));
res_templ.target = PIPE_TEXTURE_2D; res_templ.target = PIPE_TEXTURE_2D;
@ -567,29 +564,45 @@ surface_from_external_memory(VADriverContextP ctx, vlVaSurface *surface,
res_templ.array_size = 1; res_templ.array_size = 1;
res_templ.width0 = memory_attribute->width; res_templ.width0 = memory_attribute->width;
res_templ.height0 = memory_attribute->height; res_templ.height0 = memory_attribute->height;
res_templ.format = surface->templat.buffer_format;
res_templ.bind = PIPE_BIND_SAMPLER_VIEW; res_templ.bind = PIPE_BIND_SAMPLER_VIEW;
res_templ.usage = PIPE_USAGE_DEFAULT; res_templ.usage = PIPE_USAGE_DEFAULT;
memset(&whandle, 0, sizeof(struct winsys_handle)); memset(&whandle, 0, sizeof(struct winsys_handle));
whandle.type = DRM_API_HANDLE_TYPE_FD; whandle.type = DRM_API_HANDLE_TYPE_FD;
whandle.handle = memory_attribute->buffers[index]; whandle.handle = memory_attribute->buffers[index];
whandle.stride = memory_attribute->pitches[0];
resource = pscreen->resource_from_handle(pscreen, &res_templ, &whandle,
PIPE_HANDLE_USAGE_READ_WRITE);
if (!resource)
return VA_STATUS_ERROR_ALLOCATION_FAILED;
// Create a resource for each plane.
memset(resources, 0, sizeof resources); memset(resources, 0, sizeof resources);
resources[0] = resource; for (i = 0; i < memory_attribute->num_planes; i++) {
res_templ.format = resource_formats[i];
if (res_templ.format == PIPE_FORMAT_NONE) {
result = VA_STATUS_ERROR_INVALID_PARAMETER;
goto fail;
}
whandle.stride = memory_attribute->pitches[i];
whandle.offset = memory_attribute->offsets[i];
resources[i] = pscreen->resource_from_handle(pscreen, &res_templ, &whandle,
PIPE_HANDLE_USAGE_READ_WRITE);
if (!resources[i]) {
result = VA_STATUS_ERROR_ALLOCATION_FAILED;
goto fail;
}
}
surface->buffer = vl_video_buffer_create_ex2(drv->pipe, templat, resources); surface->buffer = vl_video_buffer_create_ex2(drv->pipe, templat, resources);
if (!surface->buffer) if (!surface->buffer) {
return VA_STATUS_ERROR_ALLOCATION_FAILED; result = VA_STATUS_ERROR_ALLOCATION_FAILED;
goto fail;
}
return VA_STATUS_SUCCESS; return VA_STATUS_SUCCESS;
fail:
for (i = 0; i < VL_NUM_COMPONENTS; i++) {
if (resources[i])
pscreen->resource_destroy(pscreen, resources[i]);
}
return result;
} }
VAStatus VAStatus