#include "util/u_memory.h"
#include "util/u_debug.h"
#include "util/u_rect.h"
+#include "vl/vl_defines.h"
#include "vdpau_private.h"
}
p_surf->device = dev;
- pipe = dev->context->pipe;
+ pipe = dev->context;
+ pipe_mutex_lock(dev->mutex);
memset(&p_surf->templat, 0, sizeof(p_surf->templat));
p_surf->templat.buffer_format = pipe->screen->get_video_param
(
PIPE_VIDEO_CAP_PREFERS_INTERLACED
);
p_surf->video_buffer = pipe->create_video_buffer(pipe, &p_surf->templat);
+ vlVdpVideoSurfaceClear(p_surf);
+ pipe_mutex_unlock(dev->mutex);
*surface = vlAddDataHTAB(p_surf);
if (*surface == 0) {
if (!p_surf)
return VDP_STATUS_INVALID_HANDLE;
+ pipe_mutex_lock(p_surf->device->mutex);
if (p_surf->video_buffer)
p_surf->video_buffer->destroy(p_surf->video_buffer);
+ pipe_mutex_unlock(p_surf->device->mutex);
FREE(p_surf);
return VDP_STATUS_OK;
return VDP_STATUS_OK;
}
+static void
+vlVdpVideoSurfaceSize(vlVdpSurface *p_surf, int component,
+ unsigned *width, unsigned *height)
+{
+ *width = p_surf->templat.width;
+ *height = p_surf->templat.height;
+
+ if (component > 0) {
+ if (p_surf->templat.chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420) {
+ *width /= 2;
+ *height /= 2;
+ } else if (p_surf->templat.chroma_format == PIPE_VIDEO_CHROMA_FORMAT_422) {
+ *height /= 2;
+ }
+ }
+ if (p_surf->templat.interlaced)
+ *height /= 2;
+}
+
/**
* Copy image data from a VdpVideoSurface to application memory in a specified
* YCbCr format.
void *const *destination_data,
uint32_t const *destination_pitches)
{
- if (!vlCreateHTAB())
- return VDP_STATUS_RESOURCES;
+ vlVdpSurface *vlsurface;
+ struct pipe_context *pipe;
+ enum pipe_format format;
+ struct pipe_sampler_view **sampler_views;
+ unsigned i, j;
- vlVdpSurface *p_surf = vlGetDataHTAB(surface);
- if (!p_surf)
+ vlsurface = vlGetDataHTAB(surface);
+ if (!vlsurface)
return VDP_STATUS_INVALID_HANDLE;
- //if (!p_surf->psurface)
- // return VDP_STATUS_RESOURCES;
+ pipe = vlsurface->device->context;
+ if (!pipe)
+ return VDP_STATUS_INVALID_HANDLE;
+
+ format = FormatYCBCRToPipe(destination_ycbcr_format);
+ if (format == PIPE_FORMAT_NONE)
+ return VDP_STATUS_INVALID_Y_CB_CR_FORMAT;
+
+ if (vlsurface->video_buffer == NULL || format != vlsurface->video_buffer->buffer_format)
+ return VDP_STATUS_NO_IMPLEMENTATION; /* TODO We don't support conversion (yet) */
+
+ pipe_mutex_lock(vlsurface->device->mutex);
+ sampler_views = vlsurface->video_buffer->get_sampler_view_planes(vlsurface->video_buffer);
+ if (!sampler_views) {
+ pipe_mutex_unlock(vlsurface->device->mutex);
+ return VDP_STATUS_RESOURCES;
+ }
- //return VDP_STATUS_OK;
- return VDP_STATUS_NO_IMPLEMENTATION;
+ for (i = 0; i < 3; ++i) {
+ unsigned width, height;
+ struct pipe_sampler_view *sv = sampler_views[i];
+ if (!sv) continue;
+
+ vlVdpVideoSurfaceSize(vlsurface, i, &width, &height);
+
+ for (j = 0; j < sv->texture->depth0; ++j) {
+ struct pipe_box box = {
+ 0, 0, j,
+ width, height, 1
+ };
+ struct pipe_transfer *transfer;
+ uint8_t *map;
+
+ map = pipe->transfer_map(pipe, sv->texture, 0,
+ PIPE_TRANSFER_READ, &box, &transfer);
+ if (!map) {
+ pipe_mutex_unlock(vlsurface->device->mutex);
+ return VDP_STATUS_RESOURCES;
+ }
+
+ util_copy_rect(destination_data[i] + destination_pitches[i] * j, sv->texture->format,
+ destination_pitches[i] * sv->texture->depth0, 0, 0,
+ box.width, box.height, map, transfer->stride, 0, 0);
+
+ pipe_transfer_unmap(pipe, transfer);
+ }
+ }
+ pipe_mutex_unlock(vlsurface->device->mutex);
+
+ return VDP_STATUS_OK;
}
/**
if (!p_surf)
return VDP_STATUS_INVALID_HANDLE;
- pipe = p_surf->device->context->pipe;
+ pipe = p_surf->device->context;
if (!pipe)
return VDP_STATUS_INVALID_HANDLE;
+ pipe_mutex_lock(p_surf->device->mutex);
if (p_surf->video_buffer == NULL || pformat != p_surf->video_buffer->buffer_format) {
/* destroy the old one */
p_surf->video_buffer = pipe->create_video_buffer(pipe, &p_surf->templat);
/* stil no luck? ok forget it we don't support it */
- if (!p_surf->video_buffer)
+ if (!p_surf->video_buffer) {
+ pipe_mutex_unlock(p_surf->device->mutex);
return VDP_STATUS_NO_IMPLEMENTATION;
+ }
+ vlVdpVideoSurfaceClear(p_surf);
}
sampler_views = p_surf->video_buffer->get_sampler_view_planes(p_surf->video_buffer);
- if (!sampler_views)
+ if (!sampler_views) {
+ pipe_mutex_unlock(p_surf->device->mutex);
return VDP_STATUS_RESOURCES;
+ }
for (i = 0; i < 3; ++i) {
+ unsigned width, height;
struct pipe_sampler_view *sv = sampler_views[i];
- if (!sv) continue;
+ if (!sv || !source_pitches[i]) continue;
+
+ vlVdpVideoSurfaceSize(p_surf, i, &width, &height);
for (j = 0; j < sv->texture->depth0; ++j) {
struct pipe_box dst_box = {
0, 0, j,
- sv->texture->width0, sv->texture->height0, 1
+ width, height, 1
};
pipe->transfer_inline_write(pipe, sv->texture, 0,
0);
}
}
+ pipe_mutex_unlock(p_surf->device->mutex);
return VDP_STATUS_OK;
}
+
+/**
+ * Helper function to initially clear the VideoSurface after (re-)creation
+ */
+void
+vlVdpVideoSurfaceClear(vlVdpSurface *vlsurf)
+{
+ struct pipe_context *pipe = vlsurf->device->context;
+ struct pipe_surface **surfaces;
+ unsigned i;
+
+ if (!vlsurf->video_buffer)
+ return;
+
+ surfaces = vlsurf->video_buffer->get_surfaces(vlsurf->video_buffer);
+ for (i = 0; i < VL_MAX_SURFACES; ++i) {
+ union pipe_color_union c = {};
+
+ if (!surfaces[i])
+ continue;
+
+ if (i > !!vlsurf->templat.interlaced)
+ c.f[0] = c.f[1] = c.f[2] = c.f[3] = 0.5f;
+
+ pipe->clear_render_target(pipe, surfaces[i], &c, 0, 0,
+ surfaces[i]->width, surfaces[i]->height);
+ }
+ pipe->flush(pipe, NULL, 0);
+}
projects / mesa.git / blobdiff