Mesa (master): vdpau: Add support for mixer attributes
Christian König
deathsimple at kemper.freedesktop.org
Mon Dec 19 12:52:37 UTC 2011
Module: Mesa
Branch: master
Commit: e8e0756bd35e5e3b70a0eee323f5aaa3707fe11d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8e0756bd35e5e3b70a0eee323f5aaa3707fe11d
Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date: Mon Dec 19 10:14:16 2011 +0100
vdpau: Add support for mixer attributes
It's harmless to add support for attributes we don't support,
since they require a feature enabled for them to affect
something. As long as they aren't enabled, nothing happens.
This enables support for custom colorspaces and background colors.
Signed-off-by: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Signed-off-by: Christian König <deathsimple at vodafone.de>
---
src/gallium/state_trackers/vdpau/mixer.c | 121 +++++++++++++++++++--
src/gallium/state_trackers/vdpau/query.c | 37 ++++++-
src/gallium/state_trackers/vdpau/vdpau_private.h | 4 +-
3 files changed, 147 insertions(+), 15 deletions(-)
diff --git a/src/gallium/state_trackers/vdpau/mixer.c b/src/gallium/state_trackers/vdpau/mixer.c
index f1ba124..b0d48f0 100644
--- a/src/gallium/state_trackers/vdpau/mixer.c
+++ b/src/gallium/state_trackers/vdpau/mixer.c
@@ -48,7 +48,6 @@ vlVdpVideoMixerCreate(VdpDevice device,
{
vlVdpVideoMixer *vmixer = NULL;
VdpStatus ret;
- float csc[16];
struct pipe_screen *screen;
unsigned max_width, max_height, i;
enum pipe_video_profile prof = PIPE_VIDEO_PROFILE_UNKNOWN;
@@ -67,13 +66,9 @@ vlVdpVideoMixerCreate(VdpDevice device,
vmixer->device = dev;
vl_compositor_init(&vmixer->compositor, dev->context->pipe);
- 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
- );
- vl_compositor_set_csc_matrix(&vmixer->compositor, csc);
+ vl_csc_get_matrix(VL_CSC_COLOR_STANDARD_BT_601, NULL, true, vmixer->csc);
+ if (!debug_get_bool_option("G3DVL_NO_CSC", FALSE))
+ vl_compositor_set_csc_matrix(&vmixer->compositor, vmixer->csc);
/*
* TODO: Handle features
@@ -120,6 +115,10 @@ vlVdpVideoMixerCreate(VdpDevice device,
VDPAU_MSG(VDPAU_TRACE, "[VDPAU] 48 < %u < %u not valid for height\n", vmixer->video_height, max_height);
goto no_params;
}
+ vmixer->luma_key_min = 0.f;
+ vmixer->luma_key_max = 1.f;
+ vmixer->noise_reduction_level = 0.f;
+ vmixer->sharpness = 0.f;
return VDP_STATUS_OK;
no_params:
@@ -245,6 +244,12 @@ vlVdpVideoMixerSetAttributeValues(VdpVideoMixer mixer,
VdpVideoMixerAttribute const *attributes,
void const *const *attribute_values)
{
+ const VdpColor *background_color;
+ union pipe_color_union color;
+ const float *vdp_csc;
+ float val;
+ unsigned i;
+
if (!(attributes && attribute_values))
return VDP_STATUS_INVALID_POINTER;
@@ -252,9 +257,59 @@ vlVdpVideoMixerSetAttributeValues(VdpVideoMixer mixer,
if (!vmixer)
return VDP_STATUS_INVALID_HANDLE;
- /*
- * TODO: Implement the function
- */
+ for (i = 0; i < attribute_count; ++i) {
+ switch (attributes[i]) {
+ case VDP_VIDEO_MIXER_ATTRIBUTE_BACKGROUND_COLOR:
+ background_color = attribute_values[i];
+ color.f[0] = background_color->red;
+ color.f[1] = background_color->green;
+ color.f[2] = background_color->blue;
+ color.f[3] = background_color->alpha;
+ vl_compositor_set_clear_color(&vmixer->compositor, &color);
+ break;
+ case VDP_VIDEO_MIXER_ATTRIBUTE_CSC_MATRIX:
+ vdp_csc = attribute_values[i];
+ vmixer->custom_csc = !!vdp_csc;
+ if (!vdp_csc)
+ vl_csc_get_matrix(VL_CSC_COLOR_STANDARD_BT_601, NULL, 1, vmixer->csc);
+ else
+ memcpy(vmixer->csc, vdp_csc, sizeof(float)*12);
+ if (!debug_get_bool_option("G3DVL_NO_CSC", FALSE))
+ vl_compositor_set_csc_matrix(&vmixer->compositor, vmixer->csc);
+ break;
+ case VDP_VIDEO_MIXER_ATTRIBUTE_NOISE_REDUCTION_LEVEL:
+ val = *(float*)attribute_values[i];
+ if (val < 0.f || val > 1.f)
+ return VDP_STATUS_INVALID_VALUE;
+ vmixer->noise_reduction_level = val;
+ break;
+ case VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MIN_LUMA:
+ val = *(float*)attribute_values[i];
+ if (val < 0.f || val > 1.f)
+ return VDP_STATUS_INVALID_VALUE;
+ vmixer->luma_key_min = val;
+ break;
+ case VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MAX_LUMA:
+ val = *(float*)attribute_values[i];
+ if (val < 0.f || val > 1.f)
+ return VDP_STATUS_INVALID_VALUE;
+ vmixer->luma_key_max = val;
+ break;
+ case VDP_VIDEO_MIXER_ATTRIBUTE_SHARPNESS_LEVEL:
+ val = *(float*)attribute_values[i];
+ if (val < -1.f || val > 1.f)
+ return VDP_STATUS_INVALID_VALUE;
+ vmixer->sharpness = val;
+ break;
+ case VDP_VIDEO_MIXER_ATTRIBUTE_SKIP_CHROMA_DEINTERLACE:
+ if (*(uint8_t*)attribute_values[i] > 1)
+ return VDP_STATUS_INVALID_VALUE;
+ vmixer->skip_chroma_deint = *(uint8_t*)attribute_values[i];
+ break;
+ default:
+ return VDP_STATUS_INVALID_VIDEO_MIXER_ATTRIBUTE;
+ }
+ }
return VDP_STATUS_OK;
}
@@ -331,7 +386,49 @@ vlVdpVideoMixerGetAttributeValues(VdpVideoMixer mixer,
VdpVideoMixerAttribute const *attributes,
void *const *attribute_values)
{
- return VDP_STATUS_NO_IMPLEMENTATION;
+ unsigned i;
+ VdpCSCMatrix **vdp_csc;
+
+ if (!(attributes && attribute_values))
+ return VDP_STATUS_INVALID_POINTER;
+
+ vlVdpVideoMixer *vmixer = vlGetDataHTAB(mixer);
+ if (!vmixer)
+ return VDP_STATUS_INVALID_HANDLE;
+
+ for (i = 0; i < attribute_count; ++i) {
+ switch (attributes[i]) {
+ case VDP_VIDEO_MIXER_ATTRIBUTE_BACKGROUND_COLOR:
+ vl_compositor_get_clear_color(&vmixer->compositor, attribute_values[i]);
+ break;
+ case VDP_VIDEO_MIXER_ATTRIBUTE_CSC_MATRIX:
+ vdp_csc = attribute_values[i];
+ if (!vmixer->custom_csc) {
+ *vdp_csc = NULL;
+ break;
+ }
+ memcpy(*vdp_csc, vmixer->csc, sizeof(float)*12);
+ break;
+ case VDP_VIDEO_MIXER_ATTRIBUTE_NOISE_REDUCTION_LEVEL:
+ *(float*)attribute_values[i] = vmixer->noise_reduction_level;
+ break;
+ case VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MIN_LUMA:
+ *(float*)attribute_values[i] = vmixer->luma_key_min;
+ break;
+ case VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MAX_LUMA:
+ *(float*)attribute_values[i] = vmixer->luma_key_max;
+ break;
+ case VDP_VIDEO_MIXER_ATTRIBUTE_SHARPNESS_LEVEL:
+ *(float*)attribute_values[i] = vmixer->sharpness;
+ break;
+ case VDP_VIDEO_MIXER_ATTRIBUTE_SKIP_CHROMA_DEINTERLACE:
+ *(uint8_t*)attribute_values[i] = vmixer->skip_chroma_deint;
+ break;
+ default:
+ return VDP_STATUS_INVALID_VIDEO_MIXER_ATTRIBUTE;
+ }
+ }
+ return VDP_STATUS_OK;
}
/**
diff --git a/src/gallium/state_trackers/vdpau/query.c b/src/gallium/state_trackers/vdpau/query.c
index cbd5afd..18ca0b1 100644
--- a/src/gallium/state_trackers/vdpau/query.c
+++ b/src/gallium/state_trackers/vdpau/query.c
@@ -349,7 +349,20 @@ vlVdpVideoMixerQueryAttributeSupport(VdpDevice device, VdpVideoMixerAttribute at
if (!is_supported)
return VDP_STATUS_INVALID_POINTER;
- return VDP_STATUS_NO_IMPLEMENTATION;
+ switch (attribute) {
+ case VDP_VIDEO_MIXER_ATTRIBUTE_BACKGROUND_COLOR:
+ case VDP_VIDEO_MIXER_ATTRIBUTE_CSC_MATRIX:
+ case VDP_VIDEO_MIXER_ATTRIBUTE_NOISE_REDUCTION_LEVEL:
+ case VDP_VIDEO_MIXER_ATTRIBUTE_SHARPNESS_LEVEL:
+ case VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MIN_LUMA:
+ case VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MAX_LUMA:
+ case VDP_VIDEO_MIXER_ATTRIBUTE_SKIP_CHROMA_DEINTERLACE:
+ *is_supported = VDP_TRUE;
+ break;
+ default:
+ *is_supported = VDP_FALSE;
+ }
+ return VDP_STATUS_OK;
}
/**
@@ -362,5 +375,25 @@ vlVdpVideoMixerQueryAttributeValueRange(VdpDevice device, VdpVideoMixerAttribute
if (!(min_value && max_value))
return VDP_STATUS_INVALID_POINTER;
- return VDP_STATUS_NO_IMPLEMENTATION;
+ switch (attribute) {
+ case VDP_VIDEO_MIXER_ATTRIBUTE_NOISE_REDUCTION_LEVEL:
+ case VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MIN_LUMA:
+ case VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MAX_LUMA:
+ *(float*)min_value = 0.f;
+ *(float*)max_value = 1.f;
+ break;
+ case VDP_VIDEO_MIXER_ATTRIBUTE_SHARPNESS_LEVEL:
+ *(float*)min_value = -1.f;
+ *(float*)max_value = 1.f;
+ break;
+ case VDP_VIDEO_MIXER_ATTRIBUTE_SKIP_CHROMA_DEINTERLACE:
+ *(uint8_t*)min_value = 0;
+ *(uint8_t*)max_value = 1;
+ break;
+ case VDP_VIDEO_MIXER_ATTRIBUTE_BACKGROUND_COLOR:
+ case VDP_VIDEO_MIXER_ATTRIBUTE_CSC_MATRIX:
+ default:
+ return VDP_STATUS_INVALID_VIDEO_MIXER_ATTRIBUTE;
+ }
+ return VDP_STATUS_OK;
}
diff --git a/src/gallium/state_trackers/vdpau/vdpau_private.h b/src/gallium/state_trackers/vdpau/vdpau_private.h
index fbada3b..84c5b82 100644
--- a/src/gallium/state_trackers/vdpau/vdpau_private.h
+++ b/src/gallium/state_trackers/vdpau/vdpau_private.h
@@ -308,7 +308,9 @@ typedef struct
struct vl_compositor compositor;
unsigned video_width, video_height;
enum pipe_video_chroma_format chroma_format;
- unsigned max_layers;
+ unsigned max_layers, skip_chroma_deint, custom_csc;
+ float luma_key_min, luma_key_max, sharpness, noise_reduction_level;
+ float csc[16];
} vlVdpVideoMixer;
typedef struct
More information about the mesa-commit
mailing list