mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

element: add a default set_clock implementation

Browse source 
Add a default set_clock implementation and avoid doing work in the vmethod
trampoline. This requires subclasses to chain up.
This commit is contained in:
Wim Taymans 2011-11-10 12:09:57 +01:00
parent 2227d80f93
commit 13754e87fc
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/gstbin.c
View file

@ -741,6 +741,9 @@ gst_bin_set_clock_func (GstElement * element, GstClock * clock)
g_value_unset (&data); g_value_unset (&data);
gst_iterator_free (it); gst_iterator_free (it);
if (res)
res = GST_ELEMENT_CLASS (parent_class)->set_clock (element, clock);
return res; return res;
} }

26
gst/gstelement.c
View file

@ -126,6 +126,8 @@ static GstStateChangeReturn gst_element_get_state_func (GstElement * element,
GstState * state, GstState * pending, GstClockTime timeout); GstState * state, GstState * pending, GstClockTime timeout);
static GstStateChangeReturn gst_element_set_state_func (GstElement * element, static GstStateChangeReturn gst_element_set_state_func (GstElement * element,
GstState state); GstState state);
static gboolean gst_element_set_clock_func (GstElement * element,
GstClock * clock);
static void gst_element_set_bus_func (GstElement * element, GstBus * bus); static void gst_element_set_bus_func (GstElement * element, GstBus * bus);
static gboolean gst_element_default_send_event (GstElement * element, static gboolean gst_element_default_send_event (GstElement * element,
@ -227,6 +229,7 @@ gst_element_class_init (GstElementClass * klass)
klass->change_state = GST_DEBUG_FUNCPTR (gst_element_change_state_func); klass->change_state = GST_DEBUG_FUNCPTR (gst_element_change_state_func);
klass->set_state = GST_DEBUG_FUNCPTR (gst_element_set_state_func); klass->set_state = GST_DEBUG_FUNCPTR (gst_element_set_state_func);
klass->get_state = GST_DEBUG_FUNCPTR (gst_element_get_state_func); klass->get_state = GST_DEBUG_FUNCPTR (gst_element_get_state_func);
klass->set_clock = GST_DEBUG_FUNCPTR (gst_element_set_clock_func);
klass->set_bus = GST_DEBUG_FUNCPTR (gst_element_set_bus_func); klass->set_bus = GST_DEBUG_FUNCPTR (gst_element_set_bus_func);
klass->query = GST_DEBUG_FUNCPTR (gst_element_default_query); klass->query = GST_DEBUG_FUNCPTR (gst_element_default_query);
klass->send_event = GST_DEBUG_FUNCPTR (gst_element_default_send_event); klass->send_event = GST_DEBUG_FUNCPTR (gst_element_default_send_event);
@ -400,6 +403,19 @@ gst_element_provide_clock (GstElement * element)
return result; return result;
} }
static gboolean
gst_element_set_clock_func (GstElement * element, GstClock * clock)
{
GstClock **clock_p;
GST_OBJECT_LOCK (element);
clock_p = &element->clock;
gst_object_replace ((GstObject **) clock_p, (GstObject *) clock);
GST_OBJECT_UNLOCK (element);
return TRUE;
}
/** /**
* gst_element_set_clock: * gst_element_set_clock:
* @element: a #GstElement to set the clock for. * @element: a #GstElement to set the clock for.
@ -419,8 +435,7 @@ gboolean
gst_element_set_clock (GstElement * element, GstClock * clock) gst_element_set_clock (GstElement * element, GstClock * clock)
{ {
GstElementClass *oclass; GstElementClass *oclass;
gboolean res = TRUE; gboolean res = FALSE;
GstClock **clock_p;
g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE); g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
g_return_val_if_fail (clock == NULL || GST_IS_CLOCK (clock), FALSE); g_return_val_if_fail (clock == NULL || GST_IS_CLOCK (clock), FALSE);
@ -432,13 +447,6 @@ gst_element_set_clock (GstElement * element, GstClock * clock)
if (oclass->set_clock) if (oclass->set_clock)
res = oclass->set_clock (element, clock); res = oclass->set_clock (element, clock);
if (res) {
/* only update the clock pointer if the element accepted the clock */
GST_OBJECT_LOCK (element);
clock_p = &element->clock;
gst_object_replace ((GstObject **) clock_p, (GstObject *) clock);
GST_OBJECT_UNLOCK (element);
}
return res; return res;
} }