mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gstbin.c: When an element is in the locked state we still want to update the base_time of the element.

Browse source 
Original commit message from CVS:
* gst/gstbin.c: (gst_bin_element_set_state):
When an element is in the locked state we still want to update the
base_time of the element.
This commit is contained in:
Wim Taymans 2008-08-25 10:52:47 +00:00
parent f0ce6a40ad
commit a6b1feccd0
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-08-25 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/gstbin.c: (gst_bin_element_set_state):
When an element is in the locked state we still want to update the
base_time of the element.
2008-08-21 Wim Taymans <wim.taymans@collabora.co.uk> 2008-08-21 Wim Taymans <wim.taymans@collabora.co.uk>
* libs/gst/base/gstbasesrc.c: (gst_base_src_default_negotiate): * libs/gst/base/gstbasesrc.c: (gst_base_src_default_negotiate):

2
common

@ -1 +1 @@
Subproject commit d70ca17ae6fbe6020996e4567275d5e14972ed45 Subproject commit 8d494854a6018336a80ece82ceb3df0033e2da9c

6
gst/gstbin.c
View file

@ -1868,6 +1868,9 @@ gst_bin_element_set_state (GstBin * bin, GstElement * element,
gboolean locked; gboolean locked;
GList *found; GList *found;
/* set base_time on child */
gst_element_set_base_time (element, base_time);
/* peel off the locked flag */ /* peel off the locked flag */
GST_OBJECT_LOCK (element); GST_OBJECT_LOCK (element);
locked = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_LOCKED_STATE); locked = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_LOCKED_STATE);
@ -1923,9 +1926,6 @@ no_preroll:
GST_ELEMENT_NAME (element), gst_element_state_get_name (next), GST_ELEMENT_NAME (element), gst_element_state_get_name (next),
GST_TIME_ARGS (base_time)); GST_TIME_ARGS (base_time));
/* set base_time on child */
gst_element_set_base_time (element, base_time);
/* change state */ /* change state */
ret = gst_element_set_state (element, next); ret = gst_element_set_state (element, next);