From 0fa950ecd38d5025bb2393bbcb96a73152764cf4 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Sun, 1 Oct 2017 21:27:20 -0400 Subject: st/va: don't re-allocate interlaced buffer with pakced format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It caused corruption, when vlVaPutImage putting raw data to the fields v2: add RGB formats since it got uploaded here as well Cc: mesa-stable@lists.freedesktop.org Cc: Andy Furniss Tested-by: Andy Furniss Reviewed-by: Christian König --- src/gallium/state_trackers/va/image.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/gallium') diff --git a/src/gallium/state_trackers/va/image.c b/src/gallium/state_trackers/va/image.c index f87de8e5c4e..86ae8685802 100644 --- a/src/gallium/state_trackers/va/image.c +++ b/src/gallium/state_trackers/va/image.c @@ -487,10 +487,13 @@ vlVaPutImage(VADriverContextP ctx, VASurfaceID surface, VAImageID image, ((format != PIPE_FORMAT_YV12) || (surf->buffer->buffer_format != PIPE_FORMAT_NV12)) && ((format != PIPE_FORMAT_IYUV) || (surf->buffer->buffer_format != PIPE_FORMAT_NV12))) { struct pipe_video_buffer *tmp_buf; - struct pipe_video_buffer templat = surf->templat; - templat.buffer_format = format; - tmp_buf = drv->pipe->create_video_buffer(drv->pipe, &templat); + surf->templat.buffer_format = format; + if (format == PIPE_FORMAT_YUYV || format == PIPE_FORMAT_UYVY || + format == PIPE_FORMAT_B8G8R8A8_UNORM || format == PIPE_FORMAT_B8G8R8X8_UNORM || + format == PIPE_FORMAT_R8G8B8A8_UNORM || format == PIPE_FORMAT_R8G8B8X8_UNORM) + surf->templat.interlaced = false; + tmp_buf = drv->pipe->create_video_buffer(drv->pipe, &surf->templat); if (!tmp_buf) { mtx_unlock(&drv->mutex); @@ -499,7 +502,6 @@ vlVaPutImage(VADriverContextP ctx, VASurfaceID surface, VAImageID image, surf->buffer->destroy(surf->buffer); surf->buffer = tmp_buf; - surf->templat.buffer_format = format; } views = surf->buffer->get_sampler_view_planes(surf->buffer); -- cgit v1.2.3