KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vl/video_buffer: add support for interlaced buffers 

Add the infrastructure, but not the decode implementation.

Signed-off-by: Christian König <deathsimple@vodafone.de>
This commit is contained in:
Christian König 2012-01-04 00:51:40 +01:00
parent 12b49ca2df
commit 9af70c90db
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/gallium/auxiliary/vl/vl_video_buffer.c
View File

@ -161,11 +161,14 @@ vl_video_buffer_destroy(struct pipe_video_buffer *buffer)
assert(buf);
for (i = 0; i < VL_MAX_PLANES; ++i) {
pipe_surface_reference(&buf->surfaces[i], NULL);
pipe_sampler_view_reference(&buf->sampler_view_planes[i], NULL);
pipe_sampler_view_reference(&buf->sampler_view_components[i], NULL);
pipe_resource_reference(&buf->resources[i], NULL);
}
for (i = 0; i < VL_MAX_PLANES * 2; ++i)
pipe_surface_reference(&buf->surfaces[i], NULL);
vl_video_buffer_set_associated_data(buffer, NULL, NULL, NULL);
FREE(buffer);
@ -251,27 +254,32 @@ vl_video_buffer_surfaces(struct pipe_video_buffer *buffer)
struct vl_video_buffer *buf = (struct vl_video_buffer *)buffer;
struct pipe_surface surf_templ;
struct pipe_context *pipe;
unsigned i;
unsigned i, j, surf;
assert(buf);
pipe = buf->base.context;
for (i = 0; i < buf->num_planes; ++i ) {
if (!buf->surfaces[i]) {
memset(&surf_templ, 0, sizeof(surf_templ));
surf_templ.format = buf->resources[i]->format;
surf_templ.usage = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET;
buf->surfaces[i] = pipe->create_surface(pipe, buf->resources[i], &surf_templ);
if (!buf->surfaces[i])
goto error;
for (i = 0, surf = 0; i < buf->num_planes; ++i ) {
for (j = 0; j < buf->resources[i]->depth0; ++j, ++surf) {
assert(surf < (VL_MAX_PLANES * 2));
if (!buf->surfaces[surf]) {
memset(&surf_templ, 0, sizeof(surf_templ));
surf_templ.format = buf->resources[i]->format;
surf_templ.usage = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET;
surf_templ.u.tex.first_layer = surf_templ.u.tex.last_layer = j;
buf->surfaces[i] = pipe->create_surface(pipe, buf->resources[i], &surf_templ);
if (!buf->surfaces[i])
goto error;
}
}
}
return buf->surfaces;
error:
for (i = 0; i < buf->num_planes; ++i )
for (i = 0; i < (VL_MAX_PLANES * 2); ++i )
pipe_surface_reference(&buf->surfaces[i], NULL);
return NULL;
@ -305,10 +313,13 @@ vl_video_buffer_create(struct pipe_context *pipe,
templat.height = pot_buffers ? util_next_power_of_two(tmpl->height)
: align(tmpl->height, MACROBLOCK_HEIGHT);
if (tmpl->interlaced)
templat.height /= 2;
return vl_video_buffer_create_ex
(
pipe, &templat, resource_formats,
1, PIPE_USAGE_STATIC
tmpl->interlaced ? 2 : 1, PIPE_USAGE_STATIC
);
}

2
src/gallium/auxiliary/vl/vl_video_buffer.h
View File

@ -45,7 +45,7 @@ struct vl_video_buffer
struct pipe_resource *resources[VL_MAX_PLANES];
struct pipe_sampler_view *sampler_view_planes[VL_MAX_PLANES];
struct pipe_sampler_view *sampler_view_components[VL_MAX_PLANES];
struct pipe_surface *surfaces[VL_MAX_PLANES];
struct pipe_surface *surfaces[VL_MAX_PLANES * 2];
};
/**

1
src/gallium/include/pipe/p_video_decoder.h
View File

@ -128,6 +128,7 @@ struct pipe_video_buffer
enum pipe_video_chroma_format chroma_format;
unsigned width;
unsigned height;
bool interlaced;
/**
* destroy this video buffer