diff options
| -rw-r--r-- | docs/reference/libs/libs-sections.txt | 4 | ||||
| -rw-r--r-- | gst-libs/gst/vaapi/gstvaapifilter.c | 191 | ||||
| -rw-r--r-- | gst-libs/gst/vaapi/gstvaapifilter.h | 20 |
3 files changed, 215 insertions, 0 deletions
diff --git a/docs/reference/libs/libs-sections.txt b/docs/reference/libs/libs-sections.txt index 049f8f7c..0aa16205 100644 --- a/docs/reference/libs/libs-sections.txt +++ b/docs/reference/libs/libs-sections.txt @@ -389,6 +389,10 @@ gst_vaapi_filter_set_format gst_vaapi_filter_set_cropping_rectangle gst_vaapi_filter_set_denoising_level gst_vaapi_filter_set_sharpening_level +gst_vaapi_filter_set_hue +gst_vaapi_filter_set_saturation +gst_vaapi_filter_set_brightness +gst_vaapi_filter_set_saturation <SUBSECTION Standard> GST_VAAPI_FILTER </SECTION> diff --git a/gst-libs/gst/vaapi/gstvaapifilter.c b/gst-libs/gst/vaapi/gstvaapifilter.c index d6e84a45..4ac3c221 100644 --- a/gst-libs/gst/vaapi/gstvaapifilter.c +++ b/gst-libs/gst/vaapi/gstvaapifilter.c @@ -184,6 +184,10 @@ enum { PROP_CROP = GST_VAAPI_FILTER_OP_CROP, PROP_DENOISE = GST_VAAPI_FILTER_OP_DENOISE, PROP_SHARPEN = GST_VAAPI_FILTER_OP_SHARPEN, + PROP_HUE = GST_VAAPI_FILTER_OP_HUE, + PROP_SATURATION = GST_VAAPI_FILTER_OP_SATURATION, + PROP_BRIGHTNESS = GST_VAAPI_FILTER_OP_BRIGHTNESS, + PROP_CONTRAST = GST_VAAPI_FILTER_OP_CONTRAST, N_PROPERTIES }; @@ -243,6 +247,58 @@ init_properties(void) "The level of sharpening/blurring to apply", -1.0, 1.0, 0.0, G_PARAM_READWRITE); + + /** + * GstVaapiFilter:hue: + * + * The color hue, expressed as a float value. Range is -180.0 to + * 180.0. Default value is 0.0 and represents no modification. + */ + g_properties[PROP_HUE] = + g_param_spec_float("hue", + "Hue", + "The color hue value", + -180.0, 180.0, 0.0, + G_PARAM_READWRITE); + + /** + * GstVaapiFilter:saturation: + * + * The color saturation, expressed as a float value. Range is 0.0 + * to 2.0. Default value is 1.0 and represents no modification. + */ + g_properties[PROP_SATURATION] = + g_param_spec_float("saturation", + "Saturation", + "The color saturation value", + 0.0, 2.0, 1.0, + G_PARAM_READWRITE); + + /** + * GstVaapiFilter:brightness: + * + * The color brightness, expressed as a float value. Range is -1.0 + * to 1.0. Default value is 0.0 and represents no modification. + */ + g_properties[PROP_BRIGHTNESS] = + g_param_spec_float("brightness", + "Brightness", + "The color brightness value", + -1.0, 1.0, 0.0, + G_PARAM_READWRITE); + + /** + * GstVaapiFilter:contrast: + * + * The color contrast, expressed as a float value. Range is 0.0 to + * 2.0. Default value is 1.0 and represents no modification. + */ + g_properties[PROP_CONTRAST] = + g_param_spec_float("contrast", + "Contrast", + "The color contrast value", + 0.0, 2.0, 1.0, + G_PARAM_READWRITE); } static void @@ -290,6 +346,14 @@ op_data_new(GstVaapiFilterOp op, GParamSpec *pspec) op_data->va_cap_size = sizeof(VAProcFilterCap); op_data->va_buffer_size = sizeof(VAProcFilterParameterBuffer); break; + case GST_VAAPI_FILTER_OP_HUE: + case GST_VAAPI_FILTER_OP_SATURATION: + case GST_VAAPI_FILTER_OP_BRIGHTNESS: + case GST_VAAPI_FILTER_OP_CONTRAST: + op_data->va_type = VAProcFilterColorBalance; + op_data->va_cap_size = sizeof(VAProcFilterCapColorBalance); + op_data->va_buffer_size = sizeof(VAProcFilterParameterBufferColorBalance); + break; default: g_assert(0 && "unsupported operation"); goto error; @@ -569,6 +633,54 @@ op_set_generic(GstVaapiFilter *filter, GstVaapiFilterOpData *op_data, return success; } +/* Update the color balance filter */ +#if USE_VA_VPP +static gboolean +op_set_color_balance_unlocked(GstVaapiFilter *filter, + GstVaapiFilterOpData *op_data, gfloat value) +{ + VAProcFilterParameterBufferColorBalance *buf; + VAProcFilterCapColorBalance *filter_cap; + gfloat va_value; + + if (!op_data || !op_ensure_buffer(filter, op_data)) + return FALSE; + + op_data->is_enabled = + (value != G_PARAM_SPEC_FLOAT(op_data->pspec)->default_value); + if (!op_data->is_enabled) + return TRUE; + + filter_cap = op_data->va_caps; + if (!op_data_get_value_float(op_data, &filter_cap->range, value, &va_value)) + return FALSE; + + buf = vaapi_map_buffer(filter->va_display, op_data->va_buffer); + if (!buf) + return FALSE; + + buf->type = op_data->va_type; + buf->attrib = op_data->va_subtype; + buf->value = va_value; + vaapi_unmap_buffer(filter->va_display, op_data->va_buffer, NULL); + return TRUE; +} +#endif + +static inline gboolean +op_set_color_balance(GstVaapiFilter *filter, GstVaapiFilterOpData *op_data, + gfloat value) +{ + gboolean success = FALSE; + +#if USE_VA_VPP + GST_VAAPI_DISPLAY_LOCK(filter->display); + success = op_set_color_balance_unlocked(filter, op_data, value); + GST_VAAPI_DISPLAY_UNLOCK(filter->display); +#endif + return success; +} + /* ------------------------------------------------------------------------- */ /* --- Surface Formats --- */ /* ------------------------------------------------------------------------- */ @@ -885,6 +997,13 @@ gst_vaapi_filter_set_operation(GstVaapiFilter *filter, GstVaapiFilterOp op, return op_set_generic(filter, op_data, (value ? g_value_get_float(value) : G_PARAM_SPEC_FLOAT(op_data->pspec)->default_value)); + case GST_VAAPI_FILTER_OP_HUE: + case GST_VAAPI_FILTER_OP_SATURATION: + case GST_VAAPI_FILTER_OP_BRIGHTNESS: + case GST_VAAPI_FILTER_OP_CONTRAST: + return op_set_color_balance(filter, op_data, + (value ? g_value_get_float(value) : + G_PARAM_SPEC_FLOAT(op_data->pspec)->default_value)); default: break; } @@ -1131,3 +1250,75 @@ gst_vaapi_filter_set_sharpening_level(GstVaapiFilter *filter, gfloat level) return op_set_generic(filter, find_operation(filter, GST_VAAPI_FILTER_OP_SHARPEN), level); } + +/** + * gst_vaapi_filter_set_hue: + * @filter: a #GstVaapiFilter + * @value: the color hue value + * + * Enables color hue adjustment to the specified value. + * + * Return value: %TRUE if the operation is supported, %FALSE otherwise. + */ +gboolean +gst_vaapi_filter_set_hue(GstVaapiFilter *filter, gfloat value) +{ + g_return_val_if_fail(filter != NULL, FALSE); + + return op_set_color_balance(filter, + find_operation(filter, GST_VAAPI_FILTER_OP_HUE), value); +} + +/** + * gst_vaapi_filter_set_saturation: + * @filter: a #GstVaapiFilter + * @value: the color saturation value + * + * Enables color saturation adjustment to the specified value. + * + * Return value: %TRUE if the operation is supported, %FALSE otherwise. + */ +gboolean +gst_vaapi_filter_set_saturation(GstVaapiFilter *filter, gfloat value) +{ + g_return_val_if_fail(filter != NULL, FALSE); + + return op_set_color_balance(filter, + find_operation(filter, GST_VAAPI_FILTER_OP_SATURATION), value); +} + +/** + * gst_vaapi_filter_set_brightness: + * @filter: a #GstVaapiFilter + * @value: the color brightness value + * + * Enables color brightness adjustment to the specified value. + * + * Return value: %TRUE if the operation is supported, %FALSE otherwise. + */ +gboolean +gst_vaapi_filter_set_brightness(GstVaapiFilter *filter, gfloat value) +{ + g_return_val_if_fail(filter != NULL, FALSE); + + return op_set_color_balance(filter, + find_operation(filter, GST_VAAPI_FILTER_OP_BRIGHTNESS), value); +} + +/** + * gst_vaapi_filter_set_contrast: + * @filter: a #GstVaapiFilter + * @value: the color contrast value + * + * Enables color contrast adjustment to the specified value. + * + * Return value: %TRUE if the operation is supported, %FALSE otherwise. + */ +gboolean +gst_vaapi_filter_set_contrast(GstVaapiFilter *filter, gfloat value) +{ + g_return_val_if_fail(filter != NULL, FALSE); + + return op_set_color_balance(filter, + find_operation(filter, GST_VAAPI_FILTER_OP_CONTRAST), value); +} diff --git a/gst-libs/gst/vaapi/gstvaapifilter.h b/gst-libs/gst/vaapi/gstvaapifilter.h index 977d9295..8da28d47 100644 --- a/gst-libs/gst/vaapi/gstvaapifilter.h +++ b/gst-libs/gst/vaapi/gstvaapifilter.h @@ -35,6 +35,10 @@ typedef struct _GstVaapiFilterOpInfo GstVaapiFilterOpInfo; * @GST_VAAPI_FILTER_OP_CROP: Crop source surface (#GstVaapiRectangle). * @GST_VAAPI_FILTER_OP_DENOISE: Noise reduction (float). * @GST_VAAPI_FILTER_OP_SHARPEN: Sharpening (float). + * @GST_VAAPI_FILTER_OP_HUE: Change color hue (float). + * @GST_VAAPI_FILTER_OP_SATURATION: Change saturation (float). + * @GST_VAAPI_FILTER_OP_BRIGHTNESS: Change brightness (float). + * @GST_VAAPI_FILTER_OP_CONTRAST: Change contrast (float). * * The set of operations that could be applied to the filter. */ @@ -43,6 +47,10 @@ typedef enum { GST_VAAPI_FILTER_OP_CROP, GST_VAAPI_FILTER_OP_DENOISE, GST_VAAPI_FILTER_OP_SHARPEN, + GST_VAAPI_FILTER_OP_HUE, + GST_VAAPI_FILTER_OP_SATURATION, + GST_VAAPI_FILTER_OP_BRIGHTNESS, + GST_VAAPI_FILTER_OP_CONTRAST, } GstVaapiFilterOp; /** @@ -117,4 +125,16 @@ gst_vaapi_filter_set_denoising_level(GstVaapiFilter *filter, gfloat level); gboolean gst_vaapi_filter_set_sharpening_level(GstVaapiFilter *filter, gfloat level); +gboolean +gst_vaapi_filter_set_hue(GstVaapiFilter *filter, gfloat value); + +gboolean +gst_vaapi_filter_set_saturation(GstVaapiFilter *filter, gfloat value); + +gboolean +gst_vaapi_filter_set_brightness(GstVaapiFilter *filter, gfloat value); + +gboolean +gst_vaapi_filter_set_contrast(GstVaapiFilter *filter, gfloat value); + #endif /* GST_VAAPI_FILTER_H */ |