From 923238f0b323ac934134a899c0907fd8674b5908 Mon Sep 17 00:00:00 2001 From: Austin Yuan Date: Mon, 26 Jul 2010 10:23:34 +0800 Subject: [PATCH] remove VADisplayAttribCSC* which is duplicated, and add VADisplayAttribCSCMatrix for customized CSC matrix Signed-off-by: Austin Yuan --- dummy_drv_video/dummy_drv_video.c | 6 +++++- va/va.h | 13 ++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dummy_drv_video/dummy_drv_video.c b/dummy_drv_video/dummy_drv_video.c index ed72824..90eb9c6 100644 --- a/dummy_drv_video/dummy_drv_video.c +++ b/dummy_drv_video/dummy_drv_video.c @@ -1040,7 +1040,7 @@ VAStatus dummy_QuerySurfaceStatus( VAStatus dummy_PutSurface( VADriverContextP ctx, VASurfaceID surface, - Drawable draw, /* X Drawable */ + void *draw, /* X Drawable */ short srcx, short srcy, unsigned short srcw, @@ -1055,6 +1055,10 @@ VAStatus dummy_PutSurface( ) { /* TODO */ + Drawable drawable = (Drawable)draw; + + (void)drawable; + return VA_STATUS_ERROR_UNKNOWN; } diff --git a/va/va.h b/va/va.h index e350f74..76c5708 100644 --- a/va/va.h +++ b/va/va.h @@ -1721,6 +1721,9 @@ typedef enum * then the value for this attribute will be set to 1 so that the client * will not attempt to re-use the surface right after returning from a call * to PutSurface. + * + * Don't use it, use flag VASurfaceDisplaying of vaQuerySurfaceStatus since + * driver may use overlay or GPU alternatively */ VADisplayAttribDirectSurface = 5, VADisplayAttribRotation = 6, @@ -1731,11 +1734,11 @@ typedef enum VADisplayAttribBLEWhiteMode = 9, VADisplayAttribBlueStretch = 10, VADisplayAttribSkinColorCorrection = 11, - VADisplayAttribCSCInputColorFormat = 12, - VADisplayAttribCSCHue = 13, - VADisplayAttribCSCSaturation = 14, - VADisplayAttribCSCBrightness = 15, - VADisplayAttribCSCContrast = 16, + /* + * For type VADisplayAttribCSCMatrix, "value" field is a pointer to the color + * conversion matrix. Each element in the matrix is float-point + */ + VADisplayAttribCSCMatrix = 12 } VADisplayAttribType; /* flags for VADisplayAttribute */ -- 2.7.4