summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers
diff options
context:
space:
mode:
authorChristian König <[email protected]>2012-02-13 11:41:23 +0100
committerChristian König <[email protected]>2012-02-14 22:31:29 +0100
commit553e8203879d163e6fe2f3a8f6b80a44749514c1 (patch)
tree978284cbd8621e5cacf849d956d0a99c50fd4ca1 /src/gallium/state_trackers
parent356eb0aadbb977b0732da077ad31cd66d1b53e23 (diff)
vl: fix low strength denoise filter
A filter strength of zero or one doesn't make any sense. Thanks to Andy Furniss for pointing this out. Signed-off-by: Christian König <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r--src/gallium/state_trackers/vdpau/mixer.c8
-rw-r--r--src/gallium/state_trackers/vdpau/vdpau_private.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/vdpau/mixer.c b/src/gallium/state_trackers/vdpau/mixer.c
index 5ce40d619ed..c3c2411eb7e 100644
--- a/src/gallium/state_trackers/vdpau/mixer.c
+++ b/src/gallium/state_trackers/vdpau/mixer.c
@@ -278,12 +278,12 @@ vlVdpVideoMixerUpdateNoiseReductionFilter(vlVdpVideoMixer *vmixer)
}
/* and create a new filter as needed */
- if (vmixer->noise_reduction. enabled && vmixer->noise_reduction.level > 0.0f) {
+ if (vmixer->noise_reduction. enabled && vmixer->noise_reduction.level > 0) {
vmixer->noise_reduction.filter = MALLOC(sizeof(struct vl_median_filter));
vl_median_filter_init(vmixer->noise_reduction.filter,
vmixer->device->context->pipe,
vmixer->video_width, vmixer->video_height,
- 9 * vmixer->noise_reduction.level,
+ vmixer->noise_reduction.level + 1,
VL_MEDIAN_FILTER_CROSS);
}
}
@@ -545,7 +545,7 @@ vlVdpVideoMixerSetAttributeValues(VdpVideoMixer mixer,
if (val < 0.f || val > 1.f)
return VDP_STATUS_INVALID_VALUE;
- vmixer->noise_reduction.level = val;
+ vmixer->noise_reduction.level = val * 10;
vlVdpVideoMixerUpdateNoiseReductionFilter(vmixer);
break;
@@ -658,7 +658,7 @@ vlVdpVideoMixerGetAttributeValues(VdpVideoMixer mixer,
break;
case VDP_VIDEO_MIXER_ATTRIBUTE_NOISE_REDUCTION_LEVEL:
- *(float*)attribute_values[i] = vmixer->noise_reduction.level;
+ *(float*)attribute_values[i] = (float)vmixer->noise_reduction.level / 10.0f;
break;
case VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MIN_LUMA:
diff --git a/src/gallium/state_trackers/vdpau/vdpau_private.h b/src/gallium/state_trackers/vdpau/vdpau_private.h
index f47c0bf1a31..35f0dc0d58a 100644
--- a/src/gallium/state_trackers/vdpau/vdpau_private.h
+++ b/src/gallium/state_trackers/vdpau/vdpau_private.h
@@ -311,7 +311,7 @@ typedef struct
struct {
bool supported, enabled;
- float level;
+ unsigned level;
struct vl_median_filter *filter;
} noise_reduction;