OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/vdpau: implement luma keying

Browse Source 
Signed-off-by: Nayan Deshmukh <nayan26deshmukh@gmail.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Nayan Deshmukh
2016-06-08 15:06:25 +05:30
committed by Christian König
parent f24eb5a178
commit 2d140ae70a
2 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/gallium/state_trackers/vdpau/mixer.c
View File

@@ -92,7 +92,6 @@ vlVdpVideoMixerCreate(VdpDevice device,
case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L8: case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L8:
case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L9: case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L9:
case VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE: case VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE:
case VDP_VIDEO_MIXER_FEATURE_LUMA_KEY:
break; break;
case VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL: case VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL:
@@ -107,6 +106,10 @@ vlVdpVideoMixerCreate(VdpDevice device,
vmixer->noise_reduction.supported = true; vmixer->noise_reduction.supported = true;
break; break;
case VDP_VIDEO_MIXER_FEATURE_LUMA_KEY:
vmixer->luma_key.supported = true;
break;
default: goto no_params; default: goto no_params;
} }
} }
@@ -148,8 +151,8 @@ vlVdpVideoMixerCreate(VdpDevice device,
vmixer->video_height, max_size); vmixer->video_height, max_size);
goto no_params; goto no_params;
} }
vmixer->luma_key_min = 0.f; vmixer->luma_key.luma_min = 1.0f;
vmixer->luma_key_max = 1.f; vmixer->luma_key.luma_max = 0.0f;
pipe_mutex_unlock(dev->mutex); pipe_mutex_unlock(dev->mutex);
return VDP_STATUS_OK; return VDP_STATUS_OK;
@@ -490,7 +493,6 @@ vlVdpVideoMixerGetFeatureSupport(VdpVideoMixer mixer,
case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L8: case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L8:
case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L9: case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L9:
case VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE: case VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE:
case VDP_VIDEO_MIXER_FEATURE_LUMA_KEY:
feature_supports[i] = false; feature_supports[i] = false;
break; break;
@@ -506,6 +508,10 @@ vlVdpVideoMixerGetFeatureSupport(VdpVideoMixer mixer,
feature_supports[i] = vmixer->noise_reduction.supported; feature_supports[i] = vmixer->noise_reduction.supported;
break; break;
case VDP_VIDEO_MIXER_FEATURE_LUMA_KEY:
feature_supports[i] = vmixer->luma_key.supported;
break;
default: default:
return VDP_STATUS_INVALID_VIDEO_MIXER_FEATURE; return VDP_STATUS_INVALID_VIDEO_MIXER_FEATURE;
} }
@@ -548,7 +554,6 @@ vlVdpVideoMixerSetFeatureEnables(VdpVideoMixer mixer,
case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L8: case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L8:
case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L9: case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L9:
case VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE: case VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE:
case VDP_VIDEO_MIXER_FEATURE_LUMA_KEY:
break; break;
case VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL: case VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL:
@@ -566,6 +571,13 @@ vlVdpVideoMixerSetFeatureEnables(VdpVideoMixer mixer,
vlVdpVideoMixerUpdateNoiseReductionFilter(vmixer); vlVdpVideoMixerUpdateNoiseReductionFilter(vmixer);
break; break;
case VDP_VIDEO_MIXER_FEATURE_LUMA_KEY:
vmixer->luma_key.enabled = feature_enables[i];
if (!debug_get_bool_option("G3DVL_NO_CSC", FALSE))
vl_compositor_set_csc_matrix(&vmixer->cstate, (const vl_csc_matrix *)&vmixer->csc,
vmixer->luma_key.luma_min, vmixer->luma_key.luma_max);
break;
default: default:
pipe_mutex_unlock(vmixer->device->mutex); pipe_mutex_unlock(vmixer->device->mutex);
return VDP_STATUS_INVALID_VIDEO_MIXER_FEATURE; return VDP_STATUS_INVALID_VIDEO_MIXER_FEATURE;
@@ -610,7 +622,6 @@ vlVdpVideoMixerGetFeatureEnables(VdpVideoMixer mixer,
case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L8: case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L8:
case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L9: case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L9:
case VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE: case VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE:
case VDP_VIDEO_MIXER_FEATURE_LUMA_KEY:
break; break;
case VDP_VIDEO_MIXER_FEATURE_SHARPNESS: case VDP_VIDEO_MIXER_FEATURE_SHARPNESS:
@@ -621,6 +632,10 @@ vlVdpVideoMixerGetFeatureEnables(VdpVideoMixer mixer,
feature_enables[i] = vmixer->noise_reduction.enabled; feature_enables[i] = vmixer->noise_reduction.enabled;
break; break;
case VDP_VIDEO_MIXER_FEATURE_LUMA_KEY:
feature_enables[i] = vmixer->luma_key.enabled;
break;
default: default:
return VDP_STATUS_INVALID_VIDEO_MIXER_FEATURE; return VDP_STATUS_INVALID_VIDEO_MIXER_FEATURE;
} }
@@ -671,7 +686,8 @@ vlVdpVideoMixerSetAttributeValues(VdpVideoMixer mixer,
else else
memcpy(vmixer->csc, vdp_csc, sizeof(vl_csc_matrix)); memcpy(vmixer->csc, vdp_csc, sizeof(vl_csc_matrix));
if (!debug_get_bool_option("G3DVL_NO_CSC", FALSE)) if (!debug_get_bool_option("G3DVL_NO_CSC", FALSE))
vl_compositor_set_csc_matrix(&vmixer->cstate, (const vl_csc_matrix *)&vmixer->csc, 1.0f, 0.0f); vl_compositor_set_csc_matrix(&vmixer->cstate, (const vl_csc_matrix *)&vmixer->csc,
vmixer->luma_key.luma_min, vmixer->luma_key.luma_max);
break; break;
case VDP_VIDEO_MIXER_ATTRIBUTE_NOISE_REDUCTION_LEVEL: case VDP_VIDEO_MIXER_ATTRIBUTE_NOISE_REDUCTION_LEVEL:
@@ -692,15 +708,22 @@ vlVdpVideoMixerSetAttributeValues(VdpVideoMixer mixer,
ret = VDP_STATUS_INVALID_VALUE; ret = VDP_STATUS_INVALID_VALUE;
goto fail; goto fail;
} }
vmixer->luma_key_min = val; vmixer->luma_key.luma_min = val;
if (!debug_get_bool_option("G3DVL_NO_CSC", FALSE))
vl_compositor_set_csc_matrix(&vmixer->cstate, (const vl_csc_matrix *)&vmixer->csc,
vmixer->luma_key.luma_min, vmixer->luma_key.luma_max);
break; break;
case VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MAX_LUMA: case VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MAX_LUMA:
val = *(float*)attribute_values[i]; val = *(float*)attribute_values[i];
if (val < 0.f || val > 1.f) { if (val < 0.f || val > 1.f) {
ret = VDP_STATUS_INVALID_VALUE; ret = VDP_STATUS_INVALID_VALUE;
goto fail; goto fail;
} }
vmixer->luma_key_max = val; vmixer->luma_key.luma_max = val;
if (!debug_get_bool_option("G3DVL_NO_CSC", FALSE))
vl_compositor_set_csc_matrix(&vmixer->cstate, (const vl_csc_matrix *)&vmixer->csc,
vmixer->luma_key.luma_min, vmixer->luma_key.luma_max);
break; break;
case VDP_VIDEO_MIXER_ATTRIBUTE_SHARPNESS_LEVEL: case VDP_VIDEO_MIXER_ATTRIBUTE_SHARPNESS_LEVEL:
@@ -814,10 +837,10 @@ vlVdpVideoMixerGetAttributeValues(VdpVideoMixer mixer,
break; break;
case VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MIN_LUMA: case VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MIN_LUMA:
*(float*)attribute_values[i] = vmixer->luma_key_min; *(float*)attribute_values[i] = vmixer->luma_key.luma_min;
break; break;
case VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MAX_LUMA: case VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MAX_LUMA:
*(float*)attribute_values[i] = vmixer->luma_key_max; *(float*)attribute_values[i] = vmixer->luma_key.luma_max;
break; break;
case VDP_VIDEO_MIXER_ATTRIBUTE_SHARPNESS_LEVEL: case VDP_VIDEO_MIXER_ATTRIBUTE_SHARPNESS_LEVEL:
*(float*)attribute_values[i] = vmixer->sharpness.value; *(float*)attribute_values[i] = vmixer->sharpness.value;

6
src/gallium/state_trackers/vdpau/vdpau_private.h
View File

@@ -362,6 +362,11 @@ typedef struct
vlVdpDevice *device; vlVdpDevice *device;
struct vl_compositor_state cstate; struct vl_compositor_state cstate;
struct {
bool supported, enabled;
float luma_min, luma_max;
} luma_key;
struct { struct {
bool supported, enabled, spatial; bool supported, enabled, spatial;
struct vl_deint_filter *filter; struct vl_deint_filter *filter;
@@ -382,7 +387,6 @@ typedef struct
unsigned video_width, video_height; unsigned video_width, video_height;
enum pipe_video_chroma_format chroma_format; enum pipe_video_chroma_format chroma_format;
unsigned max_layers, skip_chroma_deint; unsigned max_layers, skip_chroma_deint;
float luma_key_min, luma_key_max;
bool custom_csc; bool custom_csc;
vl_csc_matrix csc; vl_csc_matrix csc;