3 files changed, 121 insertions, 9 deletions

diff --git a/src/gallium/state_trackers/xorg/xvmc/attributes.c b/src/gallium/state_trackers/xorg/xvmc/attributes.c
index c1cea655241..06d5dc919b4 100644
--- a/src/gallium/state_trackers/xorg/xvmc/attributes.c
+++ b/src/gallium/state_trackers/xorg/xvmc/attributes.c
@@ -26,27 +26,131 @@
  **************************************************************************/
 
 #include <assert.h>
+#include <stdlib.h>
 
 #include <X11/Xlib.h>
 #include <X11/extensions/Xvlib.h>
 #include <X11/extensions/XvMClib.h>
 
-#include <pipe/p_compiler.h>
+#include <vl/vl_compositor.h>
+
+#include "xvmc_private.h"
+
+#define XV_BRIGHTNESS "XV_BRIGHTNESS"
+#define XV_CONTRAST   "XV_CONTRAST"
+#define XV_SATURATION "XV_SATURATION"
+#define XV_HUE        "XV_HUE"
+#define XV_COLORSPACE "XV_COLORSPACE"
+
+static const XvAttribute attributes[] = {
+   { XvGettable | XvSettable, -1000, 1000, XV_BRIGHTNESS },
+   { XvGettable | XvSettable, -1000, 1000, XV_CONTRAST },
+   { XvGettable | XvSettable, -1000, 1000, XV_SATURATION },
+   { XvGettable | XvSettable, -1000, 1000, XV_HUE },
+   { XvGettable | XvSettable, 0, 1, XV_COLORSPACE }
+};
 
 PUBLIC
 XvAttribute* XvMCQueryAttributes(Display *dpy, XvMCContext *context, int *number)
 {
-   return NULL;
+   XvMCContextPrivate *context_priv;
+   XvAttribute *result;
+
+   assert(dpy && number);
+
+   if (!context || !context->privData)
+      return NULL;
+
+   context_priv = context->privData;
+
+   result = malloc(sizeof(attributes));
+   if (!result)
+      return NULL;
+
+   memcpy(result, attributes, sizeof(attributes));
+   *number = sizeof(attributes) / sizeof(XvAttribute);
+
+   XVMC_MSG(XVMC_TRACE, "[XvMC] Returning %d attributes for context %p.\n", *number, context);
+
+   return result;
 }
 
 PUBLIC
 Status XvMCSetAttribute(Display *dpy, XvMCContext *context, Atom attribute, int value)
 {
-   return BadImplementation;
+   XvMCContextPrivate *context_priv;
+   const char *attr;
+   float csc[16];
+
+   assert(dpy);
+
+   if (!context || !context->privData)
+      return XvMCBadContext;
+
+   context_priv = context->privData;
+
+   attr = XGetAtomName(dpy, attribute);
+   if (!attr)
+      return XvMCBadContext;
+
+   if (strcmp(attr, XV_BRIGHTNESS))
+      context_priv->procamp.brightness = value / 1000.0f;
+   else if (strcmp(attr, XV_CONTRAST))
+      context_priv->procamp.contrast = value / 1000.0f + 1.0f;
+   else if (strcmp(attr, XV_SATURATION))
+      context_priv->procamp.saturation = value / 1000.0f + 1.0f;
+   else if (strcmp(attr, XV_HUE))
+      context_priv->procamp.hue = value / 1000.0f;
+   else if (strcmp(attr, XV_COLORSPACE))
+      context_priv->color_standard = value ?
+         VL_CSC_COLOR_STANDARD_BT_601 :
+         VL_CSC_COLOR_STANDARD_BT_709;
+   else
+      return BadName;
+
+   vl_csc_get_matrix
+   (
+      context_priv->color_standard,
+      &context_priv->procamp, true, csc
+   );
+   context_priv->compositor->set_csc_matrix(context_priv->compositor, csc);
+
+   XVMC_MSG(XVMC_TRACE, "[XvMC] Set attribute %s to value %d.\n", attr, value);
+
+   return Success;
 }
 
 PUBLIC
 Status XvMCGetAttribute(Display *dpy, XvMCContext *context, Atom attribute, int *value)
 {
-   return BadImplementation;
+   XvMCContextPrivate *context_priv;
+   const char *attr;
+
+   assert(dpy);
+
+   if (!context || !context->privData)
+      return XvMCBadContext;
+
+   context_priv = context->privData;
+
+   attr = XGetAtomName(dpy, attribute);
+   if (!attr)
+      return XvMCBadContext;
+
+   if (strcmp(attr, XV_BRIGHTNESS))
+      *value = context_priv->procamp.brightness * 1000;
+   else if (strcmp(attr, XV_CONTRAST))
+      *value = context_priv->procamp.contrast * 1000 - 1000;
+   else if (strcmp(attr, XV_SATURATION))
+      *value = context_priv->procamp.saturation * 1000 + 1000;
+   else if (strcmp(attr, XV_HUE))
+      *value = context_priv->procamp.hue * 1000;
+   else if (strcmp(attr, XV_COLORSPACE))
+      *value = context_priv->color_standard == VL_CSC_COLOR_STANDARD_BT_709;
+   else
+      return BadName;
+
+   XVMC_MSG(XVMC_TRACE, "[XvMC] Got value %d for attribute %s.\n", *value, attr);
+
+   return Success;
 }
diff --git a/src/gallium/state_trackers/xorg/xvmc/context.c b/src/gallium/state_trackers/xorg/xvmc/context.c
index b0338336ae8..f77dc0906bb 100644
--- a/src/gallium/state_trackers/xorg/xvmc/context.c
+++ b/src/gallium/state_trackers/xorg/xvmc/context.c
@@ -270,12 +270,15 @@ Status XvMCCreateContext(Display *dpy, XvPortID port, int surface_type_id,
       return BadAlloc;
    }
 
-   /* TODO: Define some Xv attribs to allow users to specify color standard, procamp */
+   context_priv->color_standard =
+      debug_get_bool_option("G3DVL_NO_CSC", FALSE) ?
+      VL_CSC_COLOR_STANDARD_IDENTITY : VL_CSC_COLOR_STANDARD_BT_601;
+   context_priv->procamp = vl_default_procamp;
+
    vl_csc_get_matrix
    (
-      debug_get_bool_option("G3DVL_NO_CSC", FALSE) ?
-      VL_CSC_COLOR_STANDARD_IDENTITY : VL_CSC_COLOR_STANDARD_BT_601,
-      NULL, true, csc
+      context_priv->color_standard,
+      &context_priv->procamp, true, csc
    );
    context_priv->compositor->set_csc_matrix(context_priv->compositor, csc);
 
diff --git a/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h b/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h
index b0239f4c46d..b902d7d2817 100644
--- a/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h
+++ b/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h
@@ -34,6 +34,8 @@
 #include <util/u_debug.h>
 #include <util/u_math.h>
 
+#include <vl/vl_csc.h>
+
 #define BLOCK_SIZE_SAMPLES 64
 #define BLOCK_SIZE_BYTES (BLOCK_SIZE_SAMPLES * 2)
 
@@ -53,6 +55,9 @@ typedef struct
    struct pipe_video_decoder *decoder;
    struct pipe_video_compositor *compositor;
 
+   enum VL_CSC_COLOR_STANDARD color_standard;
+   struct vl_procamp procamp;
+
    unsigned short subpicture_max_width;
    unsigned short subpicture_max_height;
 } XvMCContextPrivate;
@@ -107,7 +112,7 @@ static INLINE void XVMC_MSG(unsigned int level, const char *fmt, ...)
    static int debug_level = -1;
 
    if (debug_level == -1) {
-      debug_level = MIN2(debug_get_num_option("XVMC_DEBUG", 0), 0);
+      debug_level = MAX2(debug_get_num_option("XVMC_DEBUG", 0), 0);
    }
 
    if (level <= debug_level) {