remove VADisplayAttribCSC* which is duplicated, and add VADisplayAttribCSCMatrix...

Signed-off-by: Austin Yuan <shengquan.yuan@gmail.com>

diff --git a/dummy_drv_video/dummy_drv_video.c b/dummy_drv_video/dummy_drv_video.c
index ed72824..90eb9c6 100644 (file)
--- 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 (file)
--- 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 */