Commit c7b65dca authored by Christian König's avatar Christian König
Browse files

xvmc: Define some Xv attribs to allow users to specify color standard and procamp

parent 537370be
......@@ -155,6 +155,13 @@ static const float identity[16] =
0.0f, 0.0f, 0.0f, 1.0f
};
const struct vl_procamp vl_default_procamp = {
.contrast = 1.0f,
.saturation = 1.0f,
.brightness = 0.0f,
.hue = 0.0f
};
void vl_csc_get_matrix(enum VL_CSC_COLOR_STANDARD cs,
struct vl_procamp *procamp,
bool full_range,
......@@ -163,10 +170,13 @@ void vl_csc_get_matrix(enum VL_CSC_COLOR_STANDARD cs,
float ybias = full_range ? -16.0f/255.0f : 0.0f;
float cbbias = -128.0f/255.0f;
float crbias = -128.0f/255.0f;
float c = procamp ? procamp->contrast : 1.0f;
float s = procamp ? procamp->saturation : 1.0f;
float b = procamp ? procamp->brightness : 0.0f;
float h = procamp ? procamp->hue : 0.0f;
const struct vl_procamp *p = procamp ? procamp : &vl_default_procamp;
float c = p->contrast;
float s = p->saturation;
float b = p->brightness;
float h = p->hue;
const float *cstd;
assert(matrix);
......
/**************************************************************************
*
*
* Copyright 2009 Younes Manton.
* All Rights Reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
......@@ -10,11 +10,11 @@
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
......@@ -22,7 +22,7 @@
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*
**************************************************************************/
#ifndef vl_csc_h
......@@ -45,6 +45,8 @@ enum VL_CSC_COLOR_STANDARD
VL_CSC_COLOR_STANDARD_BT_709
};
extern const struct vl_procamp vl_default_procamp;
void vl_csc_get_matrix(enum VL_CSC_COLOR_STANDARD cs,
struct vl_procamp *procamp,
bool full_range,
......
......@@ -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;
}
......@@ -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);
......
......@@ -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) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment