From 511cb3fbf9352540dd667aa6b3bb7e24c93a4ce6 Mon Sep 17 00:00:00 2001 From: Younes Manton Date: Sun, 6 Jun 2010 13:31:53 -0400 Subject: [PATCH] vl: Decode to XRGB, not ARGB. --- src/gallium/drivers/nvfx/nvfx_video_context.c | 2 +- src/gallium/drivers/softpipe/sp_video_context.c | 2 +- src/gallium/include/pipe/p_format.h | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/nvfx/nvfx_video_context.c b/src/gallium/drivers/nvfx/nvfx_video_context.c index 4e21f35..9212ae5 100644 --- a/src/gallium/drivers/nvfx/nvfx_video_context.c +++ b/src/gallium/drivers/nvfx/nvfx_video_context.c @@ -45,5 +45,5 @@ nvfx_video_create(struct pipe_screen *screen, enum pipe_video_profile profile, VL_MPEG12_MC_RENDERER_BUFFER_PICTURE, VL_MPEG12_MC_RENDERER_EMPTY_BLOCK_XFER_ONE, true, - PIPE_FORMAT_VUYA); + PIPE_FORMAT_VUYX); } diff --git a/src/gallium/drivers/softpipe/sp_video_context.c b/src/gallium/drivers/softpipe/sp_video_context.c index 9aec8a8..9d3a1ab 100644 --- a/src/gallium/drivers/softpipe/sp_video_context.c +++ b/src/gallium/drivers/softpipe/sp_video_context.c @@ -402,7 +402,7 @@ sp_video_create(struct pipe_screen *screen, enum pipe_video_profile profile, VL_MPEG12_MC_RENDERER_BUFFER_PICTURE, VL_MPEG12_MC_RENDERER_EMPTY_BLOCK_XFER_ONE, true, - PIPE_FORMAT_AYUV); + PIPE_FORMAT_XYUV); } struct pipe_video_context * diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h index 70a768c..5ca27b3 100644 --- a/src/gallium/include/pipe/p_format.h +++ b/src/gallium/include/pipe/p_format.h @@ -195,6 +195,8 @@ enum pipe_format { PIPE_FORMAT_NV21 = 140, PIPE_FORMAT_AYUV = PIPE_FORMAT_A8R8G8B8_UNORM, PIPE_FORMAT_VUYA = PIPE_FORMAT_B8G8R8A8_UNORM, + PIPE_FORMAT_XYUV = PIPE_FORMAT_X8R8G8B8_UNORM, + PIPE_FORMAT_VUYX = PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_FORMAT_IA44 = 141, PIPE_FORMAT_AI44 = 142, @@ -207,6 +209,7 @@ enum pipe_video_chroma_format PIPE_VIDEO_CHROMA_FORMAT_422, PIPE_VIDEO_CHROMA_FORMAT_444 }; + #ifdef __cplusplus } #endif -- 2.7.4