mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-26 00:58:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapisink: use GObject setter and getter

Browse source 
Instead of using gst_vaapi_display_set_property() or
gst_vaapi_display_get_property(), this patch set replace it usage
with g_object_set() or g_object_get().

Also the internal helper cb_set_value() is removed since it is not
used anymore.

https://bugzilla.gnome.org/show_bug.cgi?id=788058
This commit is contained in:
Víctor Manuel Jáquez Leal 2017-09-22 19:25:20 +02:00
parent b23ccc69b0
commit b063511c05
1 changed files with 14 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
gst/vaapi/gstvaapisink.c
View file

@ -652,14 +652,14 @@ cb_get_gvalue (GstVaapiSink * sink, guint id)
} }
static gboolean static gboolean
cb_set_gvalue (GstVaapiSink * sink, guint id, const GValue * value) cb_set_value (GstVaapiSink * sink, guint id, gfloat value)
{ {
GValue *const v_value = cb_get_gvalue (sink, id); GValue *const v_value = cb_get_gvalue (sink, id);
if (!v_value) if (!v_value)
return FALSE; return FALSE;
g_value_set_float (v_value, g_value_get_float (value)); g_value_set_float (v_value, value);
sink->cb_changed |= (1U << id); sink->cb_changed |= (1U << id);
return TRUE; return TRUE;
} }
@ -672,57 +672,40 @@ cb_get_value (GstVaapiSink * sink, guint id)
return v_value ? g_value_get_float (v_value) : 0.0; return v_value ? g_value_get_float (v_value) : 0.0;
} }
static gboolean
cb_set_value (GstVaapiSink * sink, guint id, gfloat value)
{
GValue v_value = G_VALUE_INIT;
gboolean success;
g_value_init (&v_value, G_TYPE_FLOAT);
g_value_set_float (&v_value, value);
success = cb_set_gvalue (sink, id, &v_value);
g_value_unset (&v_value);
return success;
}
static gboolean static gboolean
cb_sync_values_from_display (GstVaapiSink * sink, GstVaapiDisplay * display) cb_sync_values_from_display (GstVaapiSink * sink, GstVaapiDisplay * display)
{ {
GValue v_value = G_VALUE_INIT; guint i;
guint i, failures = 0; gfloat value;
for (i = 0; i < G_N_ELEMENTS (sink->cb_values); i++) { for (i = 0; i < G_N_ELEMENTS (sink->cb_values); i++) {
const guint cb_id = CB_HUE + i; const guint cb_id = CB_HUE + i;
if (!gst_vaapi_display_has_property (display, cb_map[i].prop_name)) if (!gst_vaapi_display_has_property (display, cb_map[i].prop_name))
continue; continue;
if (G_IS_VALUE (&v_value)) value = 0.0;
g_value_unset (&v_value); g_object_get (display, cb_map[i].prop_name, &value, NULL);
if (gst_vaapi_display_get_property (display, cb_map[i].prop_name, &v_value)) cb_set_value (sink, cb_id, value);
cb_set_gvalue (sink, cb_id, &v_value);
else
failures++;
} }
sink->cb_changed = 0; sink->cb_changed = 0;
return failures == 0; return TRUE;
} }
static gboolean static gboolean
cb_sync_values_to_display (GstVaapiSink * sink, GstVaapiDisplay * display) cb_sync_values_to_display (GstVaapiSink * sink, GstVaapiDisplay * display)
{ {
guint i, failures = 0; guint i;
for (i = 0; i < G_N_ELEMENTS (sink->cb_values); i++) { for (i = 0; i < G_N_ELEMENTS (sink->cb_values); i++) {
const guint cb_id = CB_HUE + i; const guint cb_id = CB_HUE + i;
if (!(sink->cb_changed & (1U << cb_id))) if (!(sink->cb_changed & (1U << cb_id)))
continue; continue;
if (!gst_vaapi_display_set_property (display, cb_map[i].prop_name, g_object_set_property (G_OBJECT (display), cb_map[i].prop_name,
cb_get_gvalue (sink, cb_id))) cb_get_gvalue (sink, cb_id));
failures++;
} }
sink->cb_changed = 0; sink->cb_changed = 0;
return failures == 0; return TRUE;
} }
#define CB_CHANNEL_FACTOR (1000.0) #define CB_CHANNEL_FACTOR (1000.0)
@ -1602,7 +1585,8 @@ gst_vaapisink_set_property (GObject * object,
case PROP_SATURATION: case PROP_SATURATION:
case PROP_BRIGHTNESS: case PROP_BRIGHTNESS:
case PROP_CONTRAST: case PROP_CONTRAST:
cb_set_gvalue (sink, (prop_id - PROP_HUE) + CB_HUE, value); cb_set_value (sink, (prop_id - PROP_HUE) + CB_HUE,
g_value_get_float (value));
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);