From d5fc3746fe3a337bccba0d644543633b728b9444 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20K=C3=B6nig?= Date: Fri, 2 Mar 2012 13:07:01 +0100 Subject: [PATCH] st/vdpau: cleanup YCBCR matching functions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- src/gallium/state_trackers/vdpau/vdpau_private.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/state_trackers/vdpau/vdpau_private.h b/src/gallium/state_trackers/vdpau/vdpau_private.h index 2898a863243..b0272d7c938 100644 --- a/src/gallium/state_trackers/vdpau/vdpau_private.h +++ b/src/gallium/state_trackers/vdpau/vdpau_private.h @@ -102,10 +102,10 @@ FormatYCBCRToPipe(VdpYCbCrFormat vdpau_format) return PIPE_FORMAT_UYVY; case VDP_YCBCR_FORMAT_YUYV: return PIPE_FORMAT_YUYV; - case VDP_YCBCR_FORMAT_Y8U8V8A8: /* Not defined in p_format.h */ - return PIPE_FORMAT_NONE; + case VDP_YCBCR_FORMAT_Y8U8V8A8: + return PIPE_FORMAT_R8G8B8A8_UNORM; case VDP_YCBCR_FORMAT_V8U8Y8A8: - return PIPE_FORMAT_VUYA; + return PIPE_FORMAT_B8G8R8A8_UNORM; default: assert(0); } @@ -125,9 +125,9 @@ PipeToFormatYCBCR(enum pipe_format p_format) return VDP_YCBCR_FORMAT_UYVY; case PIPE_FORMAT_YUYV: return VDP_YCBCR_FORMAT_YUYV; - //case PIPE_FORMAT_YUVA: - // return VDP_YCBCR_FORMAT_Y8U8V8A8; - case PIPE_FORMAT_VUYA: + case PIPE_FORMAT_R8G8B8A8_UNORM: + return VDP_YCBCR_FORMAT_Y8U8V8A8; + case PIPE_FORMAT_B8G8R8A8_UNORM: return VDP_YCBCR_FORMAT_V8U8Y8A8; default: assert(0); -- 2.30.2