From 7f6af4909241de7197e774dee988f574cb576a3b Mon Sep 17 00:00:00 2001 From: Christian König Date: Sat, 24 Mar 2012 13:11:25 +0100 Subject: st/vdpau: clear video surface at least once MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So if anything goes wrong we won't display a random image. v2: flush before using the surface with the decoder. Signed-off-by: Christian König --- src/gallium/state_trackers/vdpau/surface.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'src/gallium/state_trackers/vdpau/surface.c') diff --git a/src/gallium/state_trackers/vdpau/surface.c b/src/gallium/state_trackers/vdpau/surface.c index c829c1ff7de..ab6960732f7 100644 --- a/src/gallium/state_trackers/vdpau/surface.c +++ b/src/gallium/state_trackers/vdpau/surface.c @@ -33,6 +33,7 @@ #include "util/u_memory.h" #include "util/u_debug.h" #include "util/u_rect.h" +#include "vl/vl_defines.h" #include "vdpau_private.h" @@ -91,6 +92,7 @@ vlVdpVideoSurfaceCreate(VdpDevice device, VdpChromaType chroma_type, 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); @@ -282,6 +284,7 @@ vlVdpVideoSurfacePutBitsYCbCr(VdpVideoSurface surface, 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); @@ -311,3 +314,29 @@ vlVdpVideoSurfacePutBitsYCbCr(VdpVideoSurface surface, 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 black = {}; + + if (!surfaces[i]) + continue; + + pipe->clear_render_target(pipe, surfaces[i], &black, 0, 0, + surfaces[i]->width, surfaces[i]->height); + } + pipe->flush(pipe, NULL); +} -- cgit v1.2.3