GStreamer

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Mon Sep 01 2008  11:28:00 UTC

Log message:
Patch by: Olivier Crete <tester at tester dot ca>
* gst/gstpad.c: (gst_pad_iterate_internal_links_default),
(gst_pad_event_default_dispatch), (gst_pad_dispatcher):
Use thread-safe internal links iterator. Fixes #549504.

Modified files:
    .               : ChangeLog
    gst             : gstpad.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4053&r2=1.4054
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpad.c.diff?r1=1.579&r2=1.580

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4053
retrieving revision 1.4054
diff -u -d -r1.4053 -r1.4054
--- ChangeLog	1 Sep 2008 10:42:00 -0000	1.4053
+++ ChangeLog	1 Sep 2008 11:27:43 -0000	1.4054
@@ -1,5 +1,13 @@
 2008-09-01  Wim Taymans  <wim.taymans@...>
 
+	Patch by: Olivier Crete <tester at tester dot ca>
+
+	* gst/gstpad.c: (gst_pad_iterate_internal_links_default),
+	(gst_pad_event_default_dispatch), (gst_pad_dispatcher):
+	Use thread-safe internal links iterator. Fixes #549504.
+2008-09-01  Wim Taymans  <wim.taymans@...>
 	Based on patch by: Olivier Crete <tester at tester dot ca>
 	* docs/gst/gstreamer-sections.txt:
Index: gstpad.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.c,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -d -r1.579 -r1.580
--- gstpad.c	1 Sep 2008 10:42:03 -0000	1.579
+++ gstpad.c	1 Sep 2008 11:27:45 -0000	1.580
@@ -2962,9 +2962,9 @@
 gst_pad_iterate_internal_links_default (GstPad * pad)
 {
   GstIterator *res;
-  GstElement *parent = NULL;
   GList **padlist;
   guint32 *cookie;
+  GMutex *lock;
   gpointer owner;
   GstIteratorDisposeFunction dispose;
@@ -2995,9 +2995,13 @@
     padlist = &data->list;
     owner = data;
     dispose = (GstIteratorDisposeFunction) int_link_iter_data_free;
+    /* reuse the pad lock, it's all we have here */
+    lock = GST_OBJECT_GET_LOCK (pad);
   } else
 #endif
   {
+    GstElement *parent;
     GST_OBJECT_LOCK (pad);
     parent = GST_PAD_PARENT (pad);
     if (!parent || !GST_IS_ELEMENT (parent))
@@ -3016,11 +3020,12 @@
     cookie = &parent->pads_cookie;
     owner = parent;
     dispose = (GstIteratorDisposeFunction) gst_object_unref;
+    lock = GST_OBJECT_GET_LOCK (parent);
   }
   res = gst_iterator_new_list (GST_TYPE_PAD,
-      GST_OBJECT_GET_LOCK (parent),
-      cookie, padlist, owner, (GstIteratorItemFunction) iterate_pad, dispose);
+      lock, cookie, padlist, owner, (GstIteratorItemFunction) iterate_pad,
+      dispose);
   return res;
@@ -3156,52 +3161,86 @@
 static gboolean
 gst_pad_event_default_dispatch (GstPad * pad, GstEvent * event)
-  GList *orig, *pads;
-  gboolean result;
+  gboolean result = FALSE;
+  GstIterator *iter;
+  gboolean done = FALSE;
+  gpointer item;
+  GstPad *eventpad;
+  GList *pushed_pads = NULL;
   GST_INFO_OBJECT (pad, "Sending event %p (%s) to all internally linked pads",
       event, GST_EVENT_TYPE_NAME (event));
-  orig = pads = gst_pad_get_internal_links (pad);
+  iter = gst_pad_iterate_internal_links (pad);
-  if (!pads) {
-    /* If this is a sinkpad and we don't have pads to send the event to, we
-     * return TRUE. This is so that when using the default handler on a sink
-     * element, we don't fail to push it. */
-    result = (GST_PAD_DIRECTION (pad) == GST_PAD_SINK);
-  } else {
-    /* we have pads, the result will be TRUE if one of the pads handled the
-     * event in the code below. */
-    result = FALSE;
-  }
+  if (!iter)
+    goto no_iter;
-  while (pads) {
-    GstPad *eventpad = GST_PAD_CAST (pads->data);
+  while (!done) {
+    switch (gst_iterator_next (iter, &item)) {
+      case GST_ITERATOR_OK:
+        eventpad = GST_PAD (item);
-    pads = g_list_next (pads);
+        /* if already pushed,  skip */
+        if (g_list_find (pushed_pads, eventpad)) {
+          gst_object_unref (item);
+          break;
+        }
-    if (GST_PAD_DIRECTION (eventpad) == GST_PAD_SRC) {
-      /* for each pad we send to, we should ref the event; it's up
-       * to downstream to unref again when handled. */
-      GST_LOG_OBJECT (pad, "Reffing and sending event %p (%s) to %s:%s",
-          event, GST_EVENT_TYPE_NAME (event), GST_DEBUG_PAD_NAME (eventpad));
-      gst_event_ref (event);
-      result |= gst_pad_push_event (eventpad, event);
-    } else {
-      /* we only send the event on one pad, multi-sinkpad elements
-       * should implement a handler */
-      GST_LOG_OBJECT (pad, "sending event %p (%s) to one sink pad %s:%s",
-      result = gst_pad_push_event (eventpad, event);
-      goto done;
+        if (GST_PAD_DIRECTION (eventpad) == GST_PAD_SRC) {
+          /* for each pad we send to, we should ref the event; it's up
+           * to downstream to unref again when handled. */
+          GST_LOG_OBJECT (pad, "Reffing and sending event %p (%s) to %s:%s",
+              event, GST_EVENT_TYPE_NAME (event),
+              GST_DEBUG_PAD_NAME (eventpad));
+          gst_event_ref (event);
+          result |= gst_pad_push_event (eventpad, event);
+        } else {
+          /* we only send the event on one pad, multi-sinkpad elements
+           * should implement a handler */
+          GST_LOG_OBJECT (pad, "sending event %p (%s) to one sink pad %s:%s",
+          result = gst_pad_push_event (eventpad, event);
+          done = TRUE;
+          event = NULL;
+        pushed_pads = g_list_prepend (pushed_pads, eventpad);
+        gst_object_unref (item);
+        break;
+      case GST_ITERATOR_RESYNC:
+        /* FIXME, if we want to reset the result value we need to remember which
+         * pads pushed with which result */
+        gst_iterator_resync (iter);
+      case GST_ITERATOR_ERROR:
+        GST_ERROR_OBJECT (pad, "Could not iterate over internally linked pads");
+        done = TRUE;
+      case GST_ITERATOR_DONE:
     }
-  /* we handled the incoming event so we unref once */
-  GST_LOG_OBJECT (pad, "handled event %p, unreffing", event);
-  gst_event_unref (event);
+  gst_iterator_free (iter);
-done:
-  g_list_free (orig);
+no_iter:
+  /* If this is a sinkpad and we don't have pads to send the event to, we
+   * return TRUE. This is so that when using the default handler on a sink
+   * element, we don't fail to push it. */
+  if (!pushed_pads)
+    result = (GST_PAD_DIRECTION (pad) == GST_PAD_SINK);
+  g_list_free (pushed_pads);
+  /* we handled the incoming event so we unref once */
+  if (event) {
+    GST_LOG_OBJECT (pad, "handled event %p, unreffing", event);
+    gst_event_unref (event);
+  }
   return result;
 }
@@ -3257,32 +3296,54 @@
     gpointer data)
   gboolean res = FALSE;
-  GList *int_pads, *orig;
+  GstIterator *iter = NULL;
   g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
   g_return_val_if_fail (dispatch != NULL, FALSE);
-  orig = int_pads = gst_pad_get_internal_links (pad);
-  while (int_pads) {
-    GstPad *int_pad = GST_PAD_CAST (int_pads->data);
-    GstPad *int_peer = gst_pad_get_peer (int_pad);
-    if (int_peer) {
-      GST_DEBUG_OBJECT (int_pad, "dispatching to peer %s:%s",
-          GST_DEBUG_PAD_NAME (int_peer));
-      res = dispatch (int_peer, data);
-      gst_object_unref (int_peer);
-      if (res)
+      {
+        GstPad *int_pad = GST_PAD_CAST (item);
+        GstPad *int_peer = gst_pad_get_peer (int_pad);
+        if (int_peer) {
+          GST_DEBUG_OBJECT (int_pad, "dispatching to peer %s:%s",
+              GST_DEBUG_PAD_NAME (int_peer));
+          done = res = dispatch (int_peer, data);
+          gst_object_unref (int_peer);
+          GST_DEBUG_OBJECT (int_pad, "no peer");
+      }
+        GST_ERROR_OBJECT (pad, "Could not iterate internally linked pads");
         break;
-      GST_DEBUG_OBJECT (int_pad, "no peer");
-    int_pads = g_list_next (int_pads);
   GST_DEBUG_OBJECT (pad, "done, result %d", res);

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Mon Sep 01 2008  14:05:59 UTC

Log message:
* gst/gstpad.c: (add_unref_pad_to_list),
(gst_pad_get_internal_links_default):
Add fallback when calling the deprecated function on an element that
implements the new internal_link handler.

Modified files:
    .               : ChangeLog
    gst             : gstpad.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4055&r2=1.4056
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpad.c.diff?r1=1.580&r2=1.581

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4055
retrieving revision 1.4056
diff -u -d -r1.4055 -r1.4056
--- ChangeLog	1 Sep 2008 13:35:28 -0000	1.4055
+++ ChangeLog	1 Sep 2008 14:05:43 -0000	1.4056
@@ -1,3 +1,10 @@
+2008-09-01  Wim Taymans  <wim.taymans@...>
+
+	* gst/gstpad.c: (add_unref_pad_to_list),
+	(gst_pad_get_internal_links_default):
+	Add fallback when calling the deprecated function on an element that
+	implements the new internal_link handler.
 2008-09-01  Stefan Kost  <ensonic@...>
 
 	* docs/gst/gstreamer-sections.txt:
Index: gstpad.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.c,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -d -r1.580 -r1.581
--- gstpad.c	1 Sep 2008 11:27:45 -0000	1.580
+++ gstpad.c	1 Sep 2008 14:05:45 -0000	1.581
@@ -3066,6 +3066,15 @@
   return res;
 }
+#ifndef GST_REMOVE_DEPRECATED
+static void
+add_unref_pad_to_list (GstPad * pad, GList * list)
+{
+  list = g_list_prepend (list, pad);
+  gst_object_unref (pad);
+}
+#endif
 /**
  * gst_pad_get_internal_links_default:
  * @pad: the #GstPad to get the internal links of.
@@ -3081,8 +3090,11 @@
  *
  * Not MT safe.
- * Deprecated: use the thread-safe gst_pad_iterate_internal_links() functions
- * instead.
+ * Deprecated: This function does not ref the pads in the list so that they
+ * could become invalid by the time the application accesses them. It's also
+ * possible that the list changes while handling the pads, which the caller of
+ * this function is unable to know. Use the thread-safe 
+ * gst_pad_iterate_internal_links_default() instead.
  */
 #ifndef GST_REMOVE_DEPRECATED
 GList *
@@ -3093,29 +3105,63 @@
   g_return_val_if_fail (GST_IS_PAD (pad), NULL);
-  /* lock pad, check and ref parent */
-  GST_OBJECT_LOCK (pad);
-  parent = GST_PAD_PARENT (pad);
-  if (!parent || !GST_IS_ELEMENT (parent))
-    goto no_parent;
+  GST_WARNING_OBJECT (pad, "Unsafe internal links used");
-  parent = gst_object_ref (parent);
-  GST_OBJECT_UNLOCK (pad);
+  /* when we get here, the default handler for get_internal_links is called,
+   * which means that the user has not installed a custom one. We first check if
+   * there is maybe a custom iterate function we can call. */
+  if (GST_PAD_ITERINTLINKFUNC (pad) &&
+      GST_PAD_ITERINTLINKFUNC (pad) != gst_pad_iterate_internal_links_default) {
+    GstIterator *it;
+    GstIteratorResult ires;
+    gboolean done = FALSE;
-  /* now lock the parent while we copy the pads */
-  GST_OBJECT_LOCK (parent);
-  if (pad->direction == GST_PAD_SRC)
-    res = g_list_copy (parent->sinkpads);
-  else
-    res = g_list_copy (parent->srcpads);
-  GST_OBJECT_UNLOCK (parent);
+    it = gst_pad_iterate_internal_links (pad);
+    /* loop over the iterator and put all elements into a list, we also
+     * immediatly unref them, which is bad. */
+    do {
+      ires = gst_iterator_foreach (it, (GFunc) add_unref_pad_to_list, res);
+      switch (ires) {
+        case GST_ITERATOR_OK:
+        case GST_ITERATOR_DONE:
+        case GST_ITERATOR_ERROR:
+          done = TRUE;
+          break;
+        case GST_ITERATOR_RESYNC:
+          /* restart, discard previous list */
+          gst_iterator_resync (it);
+          g_list_free (res);
+          res = NULL;
+      }
+    } while (!done);
+    gst_iterator_free (it);
+  } else {
+    /* lock pad, check and ref parent */
+    GST_OBJECT_LOCK (pad);
+    parent = GST_PAD_PARENT (pad);
+    if (!parent || !GST_IS_ELEMENT (parent))
+      goto no_parent;
+    parent = gst_object_ref (parent);
+    GST_OBJECT_UNLOCK (pad);
+    /* now lock the parent while we copy the pads */
+    GST_OBJECT_LOCK (parent);
+    if (pad->direction == GST_PAD_SRC)
+      res = g_list_copy (parent->sinkpads);
+    else
+      res = g_list_copy (parent->srcpads);
+    GST_OBJECT_UNLOCK (parent);
+    gst_object_unref (parent);
+  }
   /* At this point pads can be changed and unreffed. Nothing we can do about it
    * because for compatibility reasons this function cannot ref the pads or
    * notify the app that the list changed. */
-  gst_object_unref (parent);
-
 no_parent:
@@ -3135,11 +3181,15 @@
  * inside of the parent element.
  * The caller must free this list after use.
- * Returns: a newly allocated #GList of pads.
+ * Returns: a newly allocated #GList of pads, free with g_list_free().
  * 
- * Deprecated: Use the thread-safe gst_pad_iterate_internal_links() instead.
+ * gst_pad_iterate_internal_links() instead.

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Sun Sep 14 2008  22:01:45 UTC

Log message:
Based on patch by: Antoine Tremblay <hexa00 at gmail dot com>
* gst/gstelement.c: (gst_element_sync_state_with_parent):
Avoid leaking the parent ref when we fail changing the state of the
element using gst_element_sync_state_with_parent(). Fixes #551978.

Modified files:
    .               : ChangeLog
    gst             : gstelement.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4060&r2=1.4061
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstelement.c.diff?r1=1.468&r2=1.469

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4060
retrieving revision 1.4061
diff -u -d -r1.4060 -r1.4061
--- ChangeLog	11 Sep 2008 16:56:45 -0000	1.4060
+++ ChangeLog	14 Sep 2008 22:01:28 -0000	1.4061
@@ -1,3 +1,11 @@
+2008-09-14  Wim Taymans  <wim.taymans@...>
+
+	Based on patch by: Antoine Tremblay <hexa00 at gmail dot com>
+	* gst/gstelement.c: (gst_element_sync_state_with_parent):
+	Avoid leaking the parent ref when we fail changing the state of the
+	element using gst_element_sync_state_with_parent(). Fixes #551978.
 2008-09-11  Tim-Philipp Müller  <tim.muller at collabora co uk>
 
 	* docs/manual/intro-motivation.xml::
Index: gstelement.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstelement.c,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -d -r1.468 -r1.469
--- gstelement.c	31 Jul 2008 15:20:30 -0000	1.468
+++ gstelement.c	14 Sep 2008 22:01:30 -0000	1.469
@@ -1840,6 +1840,7 @@
     GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element,
         "syncing state failed (%s)",
         gst_element_state_change_return_get_name (ret));
+    gst_object_unref (parent);
     return FALSE;
   }
 }

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Mon Oct 06 2008  08:45:56 UTC

Log message:
Patch by: Antoine Tremblay <hexa00 at gmail dot com>
* gst/gstpad.c: (gst_pad_link_check_compatible_unlocked):
Original patch by : Simon Descaries
Fix small refount leak in caps compatibility check.
Fixes #551676.

Modified files:
    .               : ChangeLog
    gst             : gstpad.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4070&r2=1.4071
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpad.c.diff?r1=1.581&r2=1.582

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4070
retrieving revision 1.4071
diff -u -d -r1.4070 -r1.4071
--- ChangeLog	6 Oct 2008 07:30:55 -0000	1.4070
+++ ChangeLog	6 Oct 2008 08:45:39 -0000	1.4071
@@ -1,3 +1,12 @@
+2008-10-06  Wim Taymans  <wim.taymans@...>
+
+	Patch by: Antoine Tremblay <hexa00 at gmail dot com>
+	* gst/gstpad.c: (gst_pad_link_check_compatible_unlocked):
+	Original patch by : Simon Descaries
+	Fix small refount leak in caps compatibility check.
+	Fixes #551676.
 2008-10-06  Stefan Kost  <ensonic@...>
 
 	* docs/pwg/advanced-request.xml:
Index: gstpad.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.c,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -d -r1.581 -r1.582
--- gstpad.c	1 Sep 2008 14:05:45 -0000	1.581
+++ gstpad.c	6 Oct 2008 08:45:42 -0000	1.582
@@ -1679,8 +1679,13 @@
   /* if we have caps on both pads we can check the intersection. If one
    * of the caps is NULL, we return TRUE. */
-  if (srccaps == NULL || sinkcaps == NULL)
+  if (srccaps == NULL || sinkcaps == NULL) {
+    if (srccaps)
+      gst_caps_unref (srccaps);
+    if (sinkcaps)
+      gst_caps_unref (sinkcaps);
     goto done;
+  }
   icaps = gst_caps_intersect (srccaps, sinkcaps);
   gst_caps_unref (srccaps);

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Mon Oct 06 2008  15:21:28 UTC

Log message:
* gst/gstquark.c:
* gst/gstquark.h:
Add some more quarks for new message. See #510354.

Modified files:
    .               : ChangeLog
    gst             : gstquark.c gstquark.h

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4074&r2=1.4075
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstquark.c.diff?r1=1.3&r2=1.4
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstquark.h.diff?r1=1.3&r2=1.4

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4074
retrieving revision 1.4075
diff -u -d -r1.4074 -r1.4075
--- ChangeLog	6 Oct 2008 12:57:39 -0000	1.4074
+++ ChangeLog	6 Oct 2008 15:21:11 -0000	1.4075
@@ -1,3 +1,9 @@
+2008-10-06  Wim Taymans  <wim.taymans@...>
+
+	* gst/gstquark.c:
+	* gst/gstquark.h:
+	Add some more quarks for new message. See #510354.
 2008-10-06  Sebastian Dröge  <sebastian.droege@...>
 
 	* docs/libs/gstreamer-libs-docs.sgml:
Index: gstquark.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstquark.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gstquark.c	8 Apr 2008 20:17:49 -0000	1.3
+++ gstquark.c	6 Oct 2008 15:21:14 -0000	1.4
@@ -34,7 +34,7 @@
   "avg-in-rate", "avg-out-rate", "buffering-left",
   "estimated-total", "old-state", "new-state", "pending-state",
   "clock", "ready", "position", "new-base-time", "live", "min-latency",
-  "max-latency", "busy"
+  "max-latency", "busy", "type", "owner"
 };
 GQuark _priv_gst_quark_table[GST_QUARK_MAX];
Index: gstquark.h
RCS file: /cvs/gstreamer/gstreamer/gst/gstquark.h,v
--- gstquark.h	8 Apr 2008 20:17:49 -0000	1.3
+++ gstquark.h	6 Oct 2008 15:21:14 -0000	1.4
@@ -60,8 +60,10 @@
   GST_QUARK_MIN_LATENCY = 31,
   GST_QUARK_MAX_LATENCY = 32,
   GST_QUARK_BUSY = 33,
+  GST_QUARK_TYPE = 34,
+  GST_QUARK_OWNER = 35,
-  GST_QUARK_MAX = 34
+  GST_QUARK_MAX = 36
 } GstQuarkId;
 extern GQuark _priv_gst_quark_table[GST_QUARK_MAX];

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Wed Oct 08 2008  10:39:38 UTC

Log message:
* gst/gstghostpad.c:
* gst/gstghostpad.h:
Unbreak -good build, private is a reserved c++ keyword.

Modified files:
    .               : ChangeLog
    gst             : gstghostpad.c gstghostpad.h

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4087&r2=1.4088
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstghostpad.c.diff?r1=1.59&r2=1.60
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstghostpad.h.diff?r1=1.8&r2=1.9

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4087
retrieving revision 1.4088
diff -u -d -r1.4087 -r1.4088
--- ChangeLog	8 Oct 2008 10:19:09 -0000	1.4087
+++ ChangeLog	8 Oct 2008 10:39:21 -0000	1.4088
@@ -1,3 +1,9 @@
+2008-10-08  Wim Taymans  <wim.taymans@...>
+
+	* gst/gstghostpad.c:
+	* gst/gstghostpad.h:
+	Unbreak -good build, private is a reserved c++ keyword.
 2008-10-08  Andy Wingo  <wingo@...>
 
 	* gst/gstghostpad.h (GST_GHOST_PAD_CAST):
Index: gstghostpad.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstghostpad.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- gstghostpad.c	8 Oct 2008 10:19:11 -0000	1.59
+++ gstghostpad.c	8 Oct 2008 10:39:24 -0000	1.60
@@ -53,7 +53,7 @@
 #define GST_CAT_DEFAULT GST_CAT_PADS
 #define GST_PROXY_PAD_CAST(obj)         ((GstProxyPad *)obj)
-#define GST_PROXY_PAD_PRIVATE(obj)      (GST_PROXY_PAD_CAST (obj)->private)
+#define GST_PROXY_PAD_PRIVATE(obj)      (GST_PROXY_PAD_CAST (obj)->priv)
 #define GST_PROXY_PAD_TARGET(pad)       (GST_PROXY_PAD_PRIVATE (pad)->target)
 #define GST_PROXY_PAD_INTERNAL(pad)     (GST_PROXY_PAD_PRIVATE (pad)->internal)
 #define GST_PROXY_GET_LOCK(pad) (GST_PROXY_PAD_PRIVATE (pad)->proxy_lock)
@@ -485,7 +485,7 @@
  */
-#define GST_GHOST_PAD_PRIVATE(obj)	(GST_GHOST_PAD_CAST (obj)->private)
+#define GST_GHOST_PAD_PRIVATE(obj)	(GST_GHOST_PAD_CAST (obj)->priv)
 struct _GstGhostPadPrivate
 {
Index: gstghostpad.h
RCS file: /cvs/gstreamer/gstreamer/gst/gstghostpad.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gstghostpad.h	8 Oct 2008 10:19:11 -0000	1.8
+++ gstghostpad.h	8 Oct 2008 10:39:24 -0000	1.9
@@ -46,7 +46,7 @@
   GstPad pad;
   /*< private > */
-  GstProxyPadPrivate *private;
+  GstProxyPadPrivate *priv;
 };
 struct _GstProxyPadClass
@@ -81,7 +81,7 @@
   GstProxyPad pad;
-  GstGhostPadPrivate *private;
+  GstGhostPadPrivate *priv;
 struct _GstGhostPadClass

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Wed Oct 08 2008  15:21:26 UTC

Log message:
* gst/gstpipeline.c: (gst_pipeline_change_state):
Release the object lock before trying to flush the bus.

Modified files:
    .               : ChangeLog
    gst             : gstpipeline.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4091&r2=1.4092
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpipeline.c.diff?r1=1.149&r2=1.150

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4091
retrieving revision 1.4092
diff -u -d -r1.4091 -r1.4092
--- ChangeLog	8 Oct 2008 14:21:10 -0000	1.4091
+++ ChangeLog	8 Oct 2008 15:21:10 -0000	1.4092
@@ -1,5 +1,10 @@
 2008-10-08  Wim Taymans  <wim.taymans@...>
 
+	* gst/gstpipeline.c: (gst_pipeline_change_state):
+	Release the object lock before trying to flush the bus.
+
+2008-10-08  Wim Taymans  <wim.taymans@...>
 	* libs/gst/base/gstbasesink.c: (gst_base_sink_send_event):
 	Forward LATENCY events upstreams so that elements know about the total
 	pipeline latency. Fixes #555307.
Index: gstpipeline.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstpipeline.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- gstpipeline.c	14 May 2008 18:17:34 -0000	1.149
+++ gstpipeline.c	8 Oct 2008 15:21:12 -0000	1.150
@@ -505,16 +505,27 @@
     case GST_STATE_CHANGE_PAUSED_TO_READY:
       break;
     case GST_STATE_CHANGE_READY_TO_NULL:
+    {
+      GstBus *bus;
+      gboolean auto_flush;
+      /* grab some stuff before we release the lock to flush out the bus */
       GST_OBJECT_LOCK (element);
-      if (element->bus) {
-        if (pipeline->priv->auto_flush_bus) {
-          gst_bus_set_flushing (element->bus, TRUE);
+      if ((bus = element->bus))
+        gst_object_ref (bus);
+      auto_flush = pipeline->priv->auto_flush_bus;
+      GST_OBJECT_UNLOCK (element);
+      if (bus) {
+        if (auto_flush) {
+          gst_bus_set_flushing (bus, TRUE);
         } else {
           GST_INFO_OBJECT (element, "not flushing bus, auto-flushing disabled");
         }
+        gst_object_unref (bus);
       }
-      GST_OBJECT_UNLOCK (element);
+    }
   }
   return result;

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Fri Oct 10 2008  15:27:52 UTC

Log message:
* gst/gstpad.c: (gst_pad_get_range), (gst_pad_pull_range):
Revert a patch from 21 months ago that broke caps negotiation in pull
mode. Basically, having a buffer pass over a pad will trigger the
setcaps function when caps change, just like in push mode.

Modified files:
    .               : ChangeLog
    gst             : gstpad.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4098&r2=1.4099
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpad.c.diff?r1=1.583&r2=1.584

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4098
retrieving revision 1.4099
diff -u -d -r1.4098 -r1.4099
--- ChangeLog	10 Oct 2008 15:12:08 -0000	1.4098
+++ ChangeLog	10 Oct 2008 15:27:35 -0000	1.4099
@@ -1,5 +1,12 @@
 2008-10-10  Wim Taymans  <wim.taymans@...>
 
+	* gst/gstpad.c: (gst_pad_get_range), (gst_pad_pull_range):
+	Revert a patch from 21 months ago that broke caps negotiation in pull
+	mode. Basically, having a buffer pass over a pad will trigger the
+	setcaps function when caps change, just like in push mode.
+
+2008-10-10  Wim Taymans  <wim.taymans@...>
 	* docs/design/part-negotiation.txt:
 	Update the docs some more.
Index: gstpad.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.c,v
retrieving revision 1.583
retrieving revision 1.584
diff -u -d -r1.583 -r1.584
--- gstpad.c	6 Oct 2008 16:15:01 -0000	1.583
+++ gstpad.c	10 Oct 2008 15:27:37 -0000	1.584
@@ -4177,10 +4177,6 @@
  * installed (see gst_pad_set_getrange_function()) this function returns
  * #GST_FLOW_NOT_SUPPORTED.
  *
- * @buffer's caps must either be unset or the same as what is already
- * configured on @pad. Renegotiation within a running pull-mode pipeline is not
- * supported.
- *
  * This is a lowlevel function. Usualy gst_pad_pull_range() is used.
  * Returns: a #GstFlowReturn from the pad.
@@ -4194,6 +4190,8 @@
   GstFlowReturn ret;
   GstPadGetRangeFunction getrangefunc;
   gboolean emit_signal;
+  GstCaps *caps;
+  gboolean caps_changed;
   g_return_val_if_fail (GST_IS_PAD (pad), GST_FLOW_ERROR);
   g_return_val_if_fail (GST_PAD_IS_SRC (pad), GST_FLOW_ERROR);
@@ -4226,23 +4224,22 @@
   GST_PAD_STREAM_UNLOCK (pad);
-  if (G_LIKELY (ret == GST_FLOW_OK)) {
-    GstCaps *caps;
-    gboolean caps_changed;
+  if (G_UNLIKELY (ret != GST_FLOW_OK))
+    goto get_range_failed;
-    GST_OBJECT_LOCK (pad);
-    /* Before pushing the buffer to the peer pad, ensure that caps
-     * are set on this pad */
-    caps = GST_BUFFER_CAPS (*buffer);
-    caps_changed = caps && caps != GST_PAD_CAPS (pad);
-    GST_OBJECT_UNLOCK (pad);
+  GST_OBJECT_LOCK (pad);
+  /* Before pushing the buffer to the peer pad, ensure that caps
+   * are set on this pad */
+  caps = GST_BUFFER_CAPS (*buffer);
+  caps_changed = caps && caps != GST_PAD_CAPS (pad);
+  GST_OBJECT_UNLOCK (pad);
-    /* we got a new datatype from the pad not supported in a running pull-mode
-     * pipeline */
-    if (G_UNLIKELY (caps_changed))
+  if (G_UNLIKELY (caps_changed)) {
+    GST_DEBUG_OBJECT (pad, "caps changed to %p %" GST_PTR_FORMAT, caps, caps);
+    /* this should usually work because the element produced the buffer */
+    if (G_UNLIKELY (!gst_pad_configure_src (pad, caps, TRUE)))
       goto not_negotiated;
   }
-
   return ret;
   /* ERRORS */
@@ -4271,23 +4268,20 @@
     *buffer = NULL;
     return GST_FLOW_UNEXPECTED;
+get_range_failed:
+  {
+    *buffer = NULL;
+    GST_CAT_WARNING_OBJECT (GST_CAT_SCHEDULING, pad,
+        "getrange failed %s", gst_flow_get_name (ret));
+    return ret;
+  }
 not_negotiated:
   {
-    /* ideally we want to use the commented-out code, but currently demuxers
-     * and typefind do not follow part-negotiation.txt. When switching into
-     * pull mode, typefind should probably return the found caps from
-     * getcaps(), and demuxers should do the setcaps(). */
-#if 0
     gst_buffer_unref (*buffer);
     GST_CAT_WARNING_OBJECT (GST_CAT_SCHEDULING, pad,
-        "getrange returned buffer of different caps");
+        "getrange returned buffer of unaccaptable caps");
     return GST_FLOW_NOT_NEGOTIATED;
-#endif
-    GST_CAT_DEBUG_OBJECT (GST_CAT_SCHEDULING, pad,
-    return ret;
 }
@@ -4328,6 +4322,8 @@
   GstPad *peer;
   g_return_val_if_fail (GST_PAD_IS_SINK (pad), GST_FLOW_ERROR);
@@ -4352,28 +4348,28 @@
   gst_object_unref (peer);
+    goto pull_range_failed;
   /* can only fire the signal if we have a valid buffer */
-  if (G_UNLIKELY (emit_signal) && (ret == GST_FLOW_OK)) {
+  if (G_UNLIKELY (emit_signal)) {
     if (!gst_pad_emit_have_data_signal (pad, GST_MINI_OBJECT (*buffer)))
       goto dropping;
-    /* we got a new datatype on the pad, see if it can handle it */
+  /* we got a new datatype on the pad, see if it can handle it */
+    if (G_UNLIKELY (!gst_pad_configure_sink (pad, caps)))
   /* ERROR recovery here */
@@ -4384,6 +4380,13 @@
     GST_OBJECT_UNLOCK (pad);
     return GST_FLOW_NOT_LINKED;
+pull_range_failed:
+        "pullrange failed %s", gst_flow_get_name (ret));
 dropping:
     GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad,
@@ -4394,21 +4397,11 @@
         "pullrange returned buffer of different caps");
-        "pullrange returned buffer of different caps");

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Mon Oct 13 2008  10:50:31 UTC

Log message:
* gst/gstbus.c: (gst_bus_source_finalize),
(gst_bus_add_watch_full_unlocked), (gst_bus_add_watch_full),
(gst_bus_enable_sync_message_emission),
(gst_bus_disable_sync_message_emission),
(gst_bus_add_signal_watch_full), (gst_bus_remove_signal_watch):
Fix deadlock, g_source_get_id() cannot be called in finalize.
Keep track of the watch source by keeping a pointer to the source object
instead.
Use the bus lock to protect access to the pointer to the current
watch source.

Modified files:
    .               : ChangeLog
    gst             : gstbus.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4102&r2=1.4103
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbus.c.diff?r1=1.67&r2=1.68

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4102
retrieving revision 1.4103
diff -u -d -r1.4102 -r1.4103
--- ChangeLog	13 Oct 2008 09:22:19 -0000	1.4102
+++ ChangeLog	13 Oct 2008 10:50:14 -0000	1.4103
@@ -1,3 +1,16 @@
+2008-10-13  Wim Taymans  <wim.taymans@...>
+
+	* gst/gstbus.c: (gst_bus_source_finalize),
+	(gst_bus_add_watch_full_unlocked), (gst_bus_add_watch_full),
+	(gst_bus_enable_sync_message_emission),
+	(gst_bus_disable_sync_message_emission),
+	(gst_bus_add_signal_watch_full), (gst_bus_remove_signal_watch):
+	Fix deadlock, g_source_get_id() cannot be called in finalize.
+	Keep track of the watch source by keeping a pointer to the source object
+	instead.
+	Use the bus lock to protect access to the pointer to the current
+	watch source.
 2008-10-13  Sebastian Dröge  <sebastian.droege@...>
 
 	Base on Patch by: Olivier Crete <tester at tester dot ca>
Index: gstbus.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstbus.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- gstbus.c	13 Oct 2008 09:22:22 -0000	1.67
+++ gstbus.c	13 Oct 2008 10:50:17 -0000	1.68
@@ -108,7 +108,7 @@
   GCond *queue_cond;
-  guint watch_id;
+  GSource *watch_id;
 };
 GType
@@ -802,9 +802,16 @@
 gst_bus_source_finalize (GSource * source)
 {
   GstBusSource *bsource = (GstBusSource *) source;
+  GstBus *bus;
-  if (bsource->bus->priv->watch_id == g_source_get_id (source))
-    bsource->bus->priv->watch_id = 0;
+  bus = bsource->bus;
+  GST_DEBUG_OBJECT (bus, "finalize source %p", source);
+  GST_OBJECT_LOCK (bus);
+  if (bus->priv->watch_id == source)
+    bus->priv->watch_id = NULL;
+  GST_OBJECT_UNLOCK (bus);
   gst_object_unref (bsource->bus);
   bsource->bus = NULL;
@@ -842,6 +849,38 @@
   return (GSource *) source;
 }
+/* must be called with the bus OBJECT LOCK */
+static guint
+gst_bus_add_watch_full_unlocked (GstBus * bus, gint priority,
+    GstBusFunc func, gpointer user_data, GDestroyNotify notify)
+{
+  guint id;
+  GSource *source;
+  if (bus->priv->watch_id) {
+    GST_ERROR_OBJECT (bus,
+        "Tried to add new watch while one was already there");
+    return 0;
+  }
+  source = gst_bus_create_watch (bus);
+  if (priority != G_PRIORITY_DEFAULT)
+    g_source_set_priority (source, priority);
+  g_source_set_callback (source, (GSourceFunc) func, user_data, notify);
+  id = g_source_attach (source, NULL);
+  g_source_unref (source);
+  if (id) {
+    bus->priv->watch_id = source;
+  GST_DEBUG_OBJECT (bus, "New source %p with id %u", source, id);
+  return id;
+}
 /**
  * gst_bus_add_watch_full:
  * @bus: a #GstBus to create the watch for.
@@ -870,29 +909,13 @@
     GstBusFunc func, gpointer user_data, GDestroyNotify notify)
   guint id;
-  GSource *source;
   g_return_val_if_fail (GST_IS_BUS (bus), 0);
-  if (bus->priv->watch_id) {
-    GST_ERROR_OBJECT (bus,
-        "Tried to add new watch while one was already there");
-    return 0;
-  }
-
-  source = gst_bus_create_watch (bus);
-  if (priority != G_PRIORITY_DEFAULT)
-    g_source_set_priority (source, priority);
-  g_source_set_callback (source, (GSourceFunc) func, user_data, notify);
-  id = g_source_attach (source, NULL);
-  g_source_unref (source);
-  bus->priv->watch_id = id;
+  id = gst_bus_add_watch_full_unlocked (bus, priority, func, user_data, notify);
-  GST_DEBUG_OBJECT (bus, "New source %p", source);
   return id;
@@ -1155,9 +1178,7 @@
   g_return_if_fail (GST_IS_BUS (bus));
   GST_OBJECT_LOCK (bus);
   bus->priv->num_sync_message_emitters++;
   GST_OBJECT_UNLOCK (bus);
@@ -1182,13 +1203,10 @@
 gst_bus_disable_sync_message_emission (GstBus * bus)
   g_return_if_fail (bus->num_signal_watchers == 0);
   bus->priv->num_sync_message_emitters--;
@@ -1221,23 +1239,30 @@
   if (bus->num_signal_watchers > 0)
     goto done;
+  /* this should not fail because the counter above takes care of it */
   g_assert (bus->signal_watch_id == 0);
   bus->signal_watch_id =
-      gst_bus_add_watch_full (bus, priority, gst_bus_async_signal_func, NULL,
-      NULL);
+      gst_bus_add_watch_full_unlocked (bus, priority, gst_bus_async_signal_func,
+      NULL, NULL);
-  if (bus->signal_watch_id == 0) {
-    GST_ERROR_OBJECT (bus, "Could not add signal watch to bus");
-    GST_OBJECT_UNLOCK (bus);
-    return;
+  if (G_UNLIKELY (bus->signal_watch_id == 0))
+    goto add_failed;
 done:
   bus->num_signal_watchers++;
+  return;
+  /* ERRORS */
+add_failed:
+  {
+    g_critical ("Could not add signal watch to bus %s", GST_OBJECT_NAME (bus));
+    GST_OBJECT_UNLOCK (bus);
+    return;
@@ -1272,6 +1297,8 @@
 void
 gst_bus_remove_signal_watch (GstBus * bus)
+  guint id = 0;
   /* I know the callees don't take this lock, so go ahead and abuse it */
@@ -1285,13 +1312,20 @@
-  g_source_remove (bus->signal_watch_id);
+  id = bus->signal_watch_id;
   bus->signal_watch_id = 0;
+  GST_DEBUG_OBJECT (bus, "removing signal watch %u", id);
+  if (id)
+    g_source_remove (id);
   return;
 error:
   {
     g_critical ("Bus %s has no signal watches attached", GST_OBJECT_NAME (bus));

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Mon Oct 20 2008  13:32:22 UTC

Log message:
* gst/gstpad.c: (gst_pad_configure_src):
When we use gst_pad_alloc_buffer() without wanting to set the caps we
also don't need to check if the caps are compatible because the caller
presumably is going to perform its own custom checks. Fixes some cases
where basetransform elements would error out when it was not needed.

Modified files:
    .               : ChangeLog
    gst             : gstpad.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4113&r2=1.4114
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpad.c.diff?r1=1.584&r2=1.585

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4113
retrieving revision 1.4114
diff -u -d -r1.4113 -r1.4114
--- ChangeLog	20 Oct 2008 13:28:58 -0000	1.4113
+++ ChangeLog	20 Oct 2008 13:32:05 -0000	1.4114
@@ -1,5 +1,13 @@
 2008-10-20  Wim Taymans  <wim.taymans@...>
 
+	* gst/gstpad.c: (gst_pad_configure_src):
+	When we use gst_pad_alloc_buffer() without wanting to set the caps we
+	also don't need to check if the caps are compatible because the caller
+	presumably is going to perform its own custom checks. Fixes some cases
+	where basetransform elements would error out when it was not needed.
+
+2008-10-20  Wim Taymans  <wim.taymans@...>
 	* libs/gst/base/gstbasesrc.c: (gst_base_src_perform_seek):
 	Update comment.
Index: gstpad.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.c,v
retrieving revision 1.584
retrieving revision 1.585
diff -u -d -r1.584 -r1.585
--- gstpad.c	10 Oct 2008 15:27:37 -0000	1.584
+++ gstpad.c	20 Oct 2008 13:32:07 -0000	1.585
@@ -2497,11 +2497,11 @@
 {
   gboolean res;
-  /* See if pad accepts the caps */
-  if (!gst_pad_accept_caps (pad, caps))
-    goto not_accepted;
-
   if (dosetcaps) {
+    /* See if pad accepts the caps */
+    if (!gst_pad_accept_caps (pad, caps))
+      goto not_accepted;
     res = gst_pad_set_caps (pad, caps);
   } else {
     res = TRUE;

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Wed Oct 29 2008  17:05:04 UTC

Log message:
* gst/gstpipeline.c: (gst_pipeline_provide_clock_func):
Some more comments.

Modified files:
    .               : ChangeLog
    gst             : gstpipeline.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4125&r2=1.4126
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpipeline.c.diff?r1=1.150&r2=1.151

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4125
retrieving revision 1.4126
diff -u -d -r1.4125 -r1.4126
--- ChangeLog	27 Oct 2008 15:02:46 -0000	1.4125
+++ ChangeLog	29 Oct 2008 17:04:47 -0000	1.4126
@@ -1,3 +1,8 @@
+2008-10-29  Wim Taymans  <wim.taymans@...>
+
+	* gst/gstpipeline.c: (gst_pipeline_provide_clock_func):
+	Some more comments.
 2008-10-27  Wim Taymans  <wim.taymans@...>
 
 	* libs/gst/base/gstbasetransform.c:
Index: gstpipeline.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstpipeline.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- gstpipeline.c	8 Oct 2008 15:21:12 -0000	1.150
+++ gstpipeline.c	29 Oct 2008 17:04:50 -0000	1.151
@@ -68,7 +68,9 @@
  * performed on it, the stream time is reset to 0. When the pipeline is
  * set from PLAYING to PAUSED, the current clock time is sampled and used to
  * configure the base time for the elements when the pipeline is set
- * to PLAYING again. This default behaviour can be changed with the
+ * to PLAYING again. The effect is that the stream time (as the difference
+ * between the clock time and the base time) will count how much time was spent
+ * in the PLAYING state. This default behaviour can be changed with the
  * gst_pipeline_set_new_stream_time() method.
  *
  * When sending a flushing seek event to a GstPipeline (see
@@ -545,6 +547,12 @@
   }
 }
+/* intercept the bus messages from our children. We watch for the ASYNC_START
+ * message with is posted by the elements (sinks) that require a reset of the
+ * running_time after a flush. ASYNC_START also brings the pipeline back into
+ * the PAUSED, pending PAUSED state. When the ASYNC_DONE message is received the
+ * pipeline will redistribute the new base_time and will bring the elements back
+ * to the desired state of the pipeline. */
 static void
 gst_pipeline_handle_message (GstBin * bin, GstMessage * message)
 {
@@ -671,8 +679,8 @@
     GST_OBJECT_UNLOCK (pipeline);
     /* let the parent bin select a clock */
     clock =
-        GST_ELEMENT_CLASS (parent_class)->
-        provide_clock (GST_ELEMENT (pipeline));
+        GST_ELEMENT_CLASS (parent_class)->provide_clock (GST_ELEMENT
+        (pipeline));
     /* no clock, use a system clock */
     if (!clock) {
       clock = gst_system_clock_obtain ();

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Tue Nov 04 2008  18:10:18 UTC

Log message:
* gst/gstbin.c: (gst_bin_handle_message_func):
Get the seqnum before we dispose the message.

Modified files:
    .               : ChangeLog
    gst             : gstbin.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4139&r2=1.4140
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbin.c.diff?r1=1.387&r2=1.388

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4139
retrieving revision 1.4140
diff -u -d -r1.4139 -r1.4140
--- ChangeLog	4 Nov 2008 16:10:02 -0000	1.4139
+++ ChangeLog	4 Nov 2008 18:10:01 -0000	1.4140
@@ -1,5 +1,10 @@
 2008-11-04  Wim Taymans  <wim.taymans@...>
 
+	* gst/gstbin.c: (gst_bin_handle_message_func):
+	Get the seqnum before we dispose the message.
+
+2008-11-04  Wim Taymans  <wim.taymans@...>
 	* docs/design/part-TODO.txt:
 	Refer to the framestepping document.
Index: gstbin.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstbin.c,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -d -r1.387 -r1.388
--- gstbin.c	4 Nov 2008 15:56:54 -0000	1.387
+++ gstbin.c	4 Nov 2008 18:10:04 -0000	1.388
@@ -2817,6 +2817,7 @@
       gint64 position;
       gst_message_parse_segment_done (message, &format, &position);
+      seqnum = gst_message_get_seqnum (message);
       GST_OBJECT_LOCK (bin);
       bin_replace_message (bin, message, GST_MESSAGE_SEGMENT_START);
@@ -2832,7 +2833,6 @@
       }
       GST_OBJECT_UNLOCK (bin);
       if (post) {
-        seqnum = gst_message_get_seqnum (message);
         tmessage = gst_message_new_segment_done (GST_OBJECT_CAST (bin),
             format, position);
         gst_message_set_seqnum (tmessage, seqnum);

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Wed Nov 05 2008  16:57:49 UTC

Log message:
* gst/gststructure.c: (gst_structure_id_empty_new_with_size):
No need to memset, we can clear the value ourselves.
* gst/gstvalue.c: (gst_type_is_fixed),
(gst_value_get_compare_func):
Some optimisations from a few callgrind sessions:
When checking if a type is fixed, check for trivial fundamental types
first before checking types for which we need to get the type followed
by the heavy duty type checks, this reduces the amount of
g_type_fundamental() calls a lot.
When getting the compare function, first check for our registered types.
If that fails, do the heavy duty g_type_is_a() checks, reduces the
amount of g_type_is_a() considerably.

Modified files:
    .               : ChangeLog
    gst             : gststructure.c gstvalue.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4141&r2=1.4142
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gststructure.c.diff?r1=1.100&r2=1.101
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstvalue.c.diff?r1=1.145&r2=1.146

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4141
retrieving revision 1.4142
diff -u -d -r1.4141 -r1.4142
--- ChangeLog	5 Nov 2008 11:17:23 -0000	1.4141
+++ ChangeLog	5 Nov 2008 16:57:33 -0000	1.4142
@@ -1,5 +1,21 @@
 2008-11-05  Wim Taymans  <wim.taymans@...>
 
+	* gst/gststructure.c: (gst_structure_id_empty_new_with_size):
+	No need to memset, we can clear the value ourselves.
+
+	* gst/gstvalue.c: (gst_type_is_fixed),
+	(gst_value_get_compare_func):
+	Some optimisations from a few callgrind sessions:
+	When checking if a type is fixed, check for trivial fundamental types
+	first before checking types for which we need to get the type followed
+	by the heavy duty type checks, this reduces the amount of
+	g_type_fundamental() calls a lot.
+	When getting the compare function, first check for our registered types.
+	If that fails, do the heavy duty g_type_is_a() checks, reduces the
+	amount of g_type_is_a() considerably.
+2008-11-05  Wim Taymans  <wim.taymans@...>
 	* docs/design/part-TODO.txt:
 	Mumble something about removing GstXML.
Index: gststructure.c
RCS file: /cvs/gstreamer/gstreamer/gst/gststructure.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- gststructure.c	31 Oct 2008 14:24:48 -0000	1.100
+++ gststructure.c	5 Nov 2008 16:57:35 -0000	1.101
@@ -113,9 +113,10 @@
 {
   GstStructure *structure;
-  structure = g_slice_new0 (GstStructure);
+  structure = g_slice_new (GstStructure);
   structure->type = gst_structure_get_type ();
   structure->name = quark;
+  structure->parent_refcount = NULL;
   structure->fields =
       g_array_sized_new (FALSE, TRUE, sizeof (GstStructureField), prealloc);
Index: gstvalue.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstvalue.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- gstvalue.c	31 Oct 2008 14:24:49 -0000	1.145
+++ gstvalue.c	5 Nov 2008 16:57:35 -0000	1.146
@@ -148,20 +148,25 @@
  * there. Do not export, since it doesn't work for types where the content
  * decides the fixedness (e.g. GST_TYPE_ARRAY).
  */
-
 static gboolean
 gst_type_is_fixed (GType type)
+  /* the basic int, string, double types */
+  if (type <= G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_GLIB_LAST)) {
+    return TRUE;
+  }
+  /* our fundamental types that are certainly not fixed */
   if (type == GST_TYPE_INT_RANGE || type == GST_TYPE_DOUBLE_RANGE ||
-      type == GST_TYPE_LIST) {
+      type == GST_TYPE_LIST || type == GST_TYPE_FRACTION_RANGE) {
     return FALSE;
   }
-  if (G_TYPE_FUNDAMENTAL (type) <=
-      G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_GLIB_LAST)) {
+  /* other (boxed) types that are fixed */
+  if (type == GST_TYPE_BUFFER) {
     return TRUE;
-  if (type == GST_TYPE_BUFFER || type == GST_TYPE_FOURCC
-      || type == GST_TYPE_ARRAY || type == GST_TYPE_FRACTION) {
+  /* heavy checks */
+  if (G_TYPE_IS_FUNDAMENTAL (type) || G_TYPE_FUNDAMENTAL (type) <=
+      G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_GLIB_LAST)) {
@@ -2795,15 +2800,22 @@
   GstValueTable *table, *best = NULL;
   guint i;
+  /* this is a fast check */
   for (i = 0; i < gst_value_table->len; i++) {
     table = &g_array_index (gst_value_table, GstValueTable, i);
     if (table->type == G_VALUE_TYPE (value1) && table->compare != NULL) {
       best = table;
       break;
     }
-    if (g_type_is_a (G_VALUE_TYPE (value1), table->type)) {
-      if (!best || g_type_is_a (table->type, best->type))
-        best = table;
+  /* slower checks */
+  if (!best) {
+    for (i = 0; i < gst_value_table->len; i++) {
+      table = &g_array_index (gst_value_table, GstValueTable, i);
+      if (g_type_is_a (G_VALUE_TYPE (value1), table->type)) {
+        if (!best || g_type_is_a (table->type, best->type))
+          best = table;
+      }
   if (best) {

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Thu Nov 06 2008  12:03:32 UTC

Log message:
* gst/gstevent.h:
Add a SKIP seek flag for use with advanced trickmodes.
API: GstSeekFlags::GST_SEEK_FLAG_SKIP

Modified files:
    .               : ChangeLog
    gst             : gstevent.h

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4142&r2=1.4143
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstevent.h.diff?r1=1.108&r2=1.109

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4142
retrieving revision 1.4143
diff -u -d -r1.4142 -r1.4143
--- ChangeLog	5 Nov 2008 16:57:33 -0000	1.4142
+++ ChangeLog	6 Nov 2008 12:03:16 -0000	1.4143
@@ -1,3 +1,9 @@
+2008-11-06  Wim Taymans  <wim.taymans@...>
+
+	* gst/gstevent.h:
+	Add a SKIP seek flag for use with advanced trickmodes.
+	API: GstSeekFlags::GST_SEEK_FLAG_SKIP
 2008-11-05  Wim Taymans  <wim.taymans@...>
 
 	* gst/gststructure.c: (gst_structure_id_empty_new_with_size):
Index: gstevent.h
RCS file: /cvs/gstreamer/gstreamer/gst/gstevent.h,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- gstevent.h	4 Nov 2008 12:22:51 -0000	1.108
+++ gstevent.h	6 Nov 2008 12:03:17 -0000	1.109
@@ -257,6 +257,9 @@
  * @GST_SEEK_FLAG_KEY_UNIT: seek to the nearest keyframe. This might be
  *		       faster but less accurate.
  * @GST_SEEK_FLAG_SEGMENT: perform a segment seek.
+ * @GST_SEEK_FLAG_SKIP: when doing fast foward or fast reverse playback, allow
+ *                     elements to skip frames instead of generating all
+ *                     frames. Since 0.10.22.
  *
  * Flags to be used with gst_element_seek() or gst_event_new_seek(). All flags
  * can be used together.
@@ -274,16 +277,21 @@
  * When this message is posted, it is possible to send a new seek event to
  * continue playback. With this seek method it is possible to perform seemless
  * looping or simple linear editing.
+ *
+ * When doing fast forward (rate > 1.0) or fast reverse (rate < -1.0) trickmode
+ * playback, the @GST_SEEK_FLAG_SKIP flag can be used to instruct decoders
+ * and demuxers to adjust the playback rate by skipping frames. This can improve
+ * performance and decrease CPU usage because not all frames need to be decoded. 
  */
 typedef enum {
   GST_SEEK_FLAG_NONE		= 0,
   GST_SEEK_FLAG_FLUSH		= (1 << 0),
   GST_SEEK_FLAG_ACCURATE	= (1 << 1),
   GST_SEEK_FLAG_KEY_UNIT	= (1 << 2),
-  GST_SEEK_FLAG_SEGMENT		= (1 << 3)
+  GST_SEEK_FLAG_SEGMENT		= (1 << 3),
+  GST_SEEK_FLAG_SKIP		= (1 << 4)
 } GstSeekFlags;
-
 /**
  * GstEvent:
  * @mini_object: the parent structure

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Thu Nov 06 2008  15:09:48 UTC

Log message:
* gst/gstcaps.c: (gst_caps_copy), (_gst_caps_free),
(gst_caps_merge_structure), (gst_caps_get_structure),
(gst_caps_copy_nth), (gst_caps_set_simple),
(gst_caps_set_simple_valist), (gst_caps_is_fixed),
(gst_caps_is_equal_fixed), (gst_caps_intersect),
(gst_caps_subtract), (gst_caps_normalize), (gst_caps_do_simplify),
(gst_caps_to_string):
Callgrind micro optimisations.
Avoid array bounds checks and force inline of trivial function.
* gst/gstobject.c: (gst_object_set_name_default):
-1 is equivalent to letting glib to the strlen but then there is more
room for optimisations and it's not our fault.
* gst/gststructure.c: (gst_structure_id_empty_new_with_size):
no need to clear the array, we're cool.
* gst/gstvalue.c: (gst_type_is_fixed), (gst_value_is_fixed):
The most common _is_fixed() check is done on fundamental glib base
types so we check this first instead of doing a huge amount of
useless GST_TYPE_ARRAY calls.

Modified files:
    .               : ChangeLog
    gst             : gstcaps.c gstobject.c gststructure.c gstvalue.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4143&r2=1.4144
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstcaps.c.diff?r1=1.190&r2=1.191
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstobject.c.diff?r1=1.130&r2=1.131
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gststructure.c.diff?r1=1.101&r2=1.102
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstvalue.c.diff?r1=1.146&r2=1.147

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4143
retrieving revision 1.4144
diff -u -d -r1.4143 -r1.4144
--- ChangeLog	6 Nov 2008 12:03:16 -0000	1.4143
+++ ChangeLog	6 Nov 2008 15:09:31 -0000	1.4144
@@ -1,5 +1,29 @@
 2008-11-06  Wim Taymans  <wim.taymans@...>
 
+	* gst/gstcaps.c: (gst_caps_copy), (_gst_caps_free),
+	(gst_caps_merge_structure), (gst_caps_get_structure),
+	(gst_caps_copy_nth), (gst_caps_set_simple),
+	(gst_caps_set_simple_valist), (gst_caps_is_fixed),
+	(gst_caps_is_equal_fixed), (gst_caps_intersect),
+	(gst_caps_subtract), (gst_caps_normalize), (gst_caps_do_simplify),
+	(gst_caps_to_string):
+	Callgrind micro optimisations.
+	Avoid array bounds checks and force inline of trivial function.
+
+	* gst/gstobject.c: (gst_object_set_name_default):
+	-1 is equivalent to letting glib to the strlen but then there is more
+	room for optimisations and it's not our fault.
+	* gst/gststructure.c: (gst_structure_id_empty_new_with_size):
+	no need to clear the array, we're cool.
+	* gst/gstvalue.c: (gst_type_is_fixed), (gst_value_is_fixed):
+	The most common _is_fixed() check is done on fundamental glib base
+	types so we check this first instead of doing a huge amount of
+	useless GST_TYPE_ARRAY calls.
+2008-11-06  Wim Taymans  <wim.taymans@...>
 	* gst/gstevent.h:
 	Add a SKIP seek flag for use with advanced trickmodes.
 	API: GstSeekFlags::GST_SEEK_FLAG_SKIP
Index: gstcaps.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstcaps.c,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- gstcaps.c	7 Aug 2008 12:28:27 -0000	1.190
+++ gstcaps.c	6 Nov 2008 15:09:33 -0000	1.191
@@ -91,6 +91,12 @@
 #define IS_WRITABLE(caps) \
   (g_atomic_int_get (&(caps)->refcount) == 1)
+/* quick way to get a caps structure at an index without doing a type or array
+ * length check */
+#define gst_caps_get_structure_unchecked(caps, index) \
+     ((GstStructure *)g_ptr_array_index ((caps)->structs, (index)))
 /* lock to protect multiple invocations of static caps to caps conversion */
 G_LOCK_DEFINE_STATIC (static_caps_lock);
@@ -272,7 +278,7 @@
   newcaps->flags = caps->flags;
   for (i = 0; i < caps->structs->len; i++) {
-    structure = gst_caps_get_structure (caps, i);
+    structure = gst_caps_get_structure_unchecked (caps, i);
     gst_caps_append_structure (newcaps, gst_structure_copy (structure));
   }
@@ -289,7 +295,7 @@
    * don't bother testing. */
-    structure = (GstStructure *) gst_caps_get_structure (caps, i);
+    structure = (GstStructure *) gst_caps_get_structure_unchecked (caps, i);
     gst_structure_set_parent_refcount (structure, NULL);
     gst_structure_free (structure);
@@ -743,7 +749,7 @@
 #endif
     /* check each structure */
     for (i = caps->structs->len - 1; i >= 0; i--) {
-      structure1 = gst_caps_get_structure (caps, i);
+      structure1 = gst_caps_get_structure_unchecked (caps, i);
       /* if structure is a subset of structure1, then skip it */
       if (gst_caps_structure_is_subset (structure1, structure)) {
         unique = FALSE;
@@ -797,7 +803,7 @@
   g_return_val_if_fail (GST_IS_CAPS (caps), NULL);
   g_return_val_if_fail (index < caps->structs->len, NULL);
-  return g_ptr_array_index (caps->structs, index);
+  return gst_caps_get_structure_unchecked (caps, index);
 }
 /**
@@ -822,7 +828,7 @@
   if (caps->structs->len > nth) {
-    structure = gst_caps_get_structure (caps, nth);
+    structure = gst_caps_get_structure_unchecked (caps, nth);
@@ -870,7 +876,7 @@
   g_return_if_fail (caps->structs->len == 1);
   g_return_if_fail (IS_WRITABLE (caps));
-  structure = gst_caps_get_structure (caps, 0);
+  structure = gst_caps_get_structure_unchecked (caps, 0);
   va_start (var_args, field);
   gst_structure_set_valist (structure, field, var_args);
@@ -896,7 +902,7 @@
   gst_structure_set_valist (structure, field, varargs);
@@ -965,7 +971,7 @@
   if (caps->structs->len != 1)
     return FALSE;
   return gst_structure_foreach (structure, gst_caps_is_fixed_foreach, NULL);
@@ -988,8 +994,8 @@
   g_return_val_if_fail (gst_caps_is_fixed (caps1), FALSE);
   g_return_val_if_fail (gst_caps_is_fixed (caps2), FALSE);
-  struct1 = gst_caps_get_structure (caps1, 0);
-  struct2 = gst_caps_get_structure (caps2, 0);
+  struct1 = gst_caps_get_structure_unchecked (caps1, 0);
+  struct2 = gst_caps_get_structure_unchecked (caps2, 0);
   if (struct1->name != struct2->name) {
@@ -1257,8 +1263,8 @@
     /* now run the diagonal line, end condition is the left or bottom
      * border */
     while (k < caps2->structs->len) {
-      struct1 = gst_caps_get_structure (caps1, j);
-      struct2 = gst_caps_get_structure (caps2, k);
+      struct1 = gst_caps_get_structure_unchecked (caps1, j);
+      struct2 = gst_caps_get_structure_unchecked (caps2, k);
       istruct = gst_caps_structure_intersect (struct1, struct2);
@@ -1371,14 +1377,14 @@
   src = gst_caps_copy (minuend);
   for (i = 0; i < subtrahend->structs->len; i++) {
-    sub = gst_caps_get_structure (subtrahend, i);
+    sub = gst_caps_get_structure_unchecked (subtrahend, i);
     if (dest) {
       gst_caps_unref (src);
       src = dest;
     }
     dest = gst_caps_new_empty ();
     for (j = 0; j < src->structs->len; j++) {
-      min = gst_caps_get_structure (src, j);
+      min = gst_caps_get_structure_unchecked (src, j);
       if (gst_structure_get_name_id (min) == gst_structure_get_name_id (sub)) {
         GSList *list;
@@ -1499,7 +1505,7 @@
   nf.caps = newcaps;
   for (i = 0; i < newcaps->structs->len; i++) {
-    nf.structure = gst_caps_get_structure (newcaps, i);
+    nf.structure = gst_caps_get_structure_unchecked (newcaps, i);
     while (!gst_structure_foreach (nf.structure,
             gst_caps_normalize_foreach, &nf));
@@ -1660,14 +1666,15 @@
   start = caps->structs->len - 1;
   for (i = caps->structs->len - 1; i >= 0; i--) {
-    simplify = gst_caps_get_structure (caps, i);
+    simplify = gst_caps_get_structure_unchecked (caps, i);
     if (gst_structure_get_name_id (simplify) !=
-        gst_structure_get_name_id (gst_caps_get_structure (caps, start)))
+        gst_structure_get_name_id (gst_caps_get_structure_unchecked (caps,
+                start)))
       start = i;
     for (j = start; j >= 0; j--) {
       if (j == i)
         continue;
-      compare = gst_caps_get_structure (caps, j);
+      compare = gst_caps_get_structure_unchecked (caps, j);
       if (gst_structure_get_name_id (simplify) !=
           gst_structure_get_name_id (compare)) {
         break;
@@ -1806,7 +1813,9 @@
   /* estimate a rough string length to avoid unnecessary reallocs in GString */
   slen = 0;
-    slen += STRUCTURE_ESTIMATED_STRING_LEN (gst_caps_get_structure (caps, i));
+    slen +=
+        STRUCTURE_ESTIMATED_STRING_LEN (gst_caps_get_structure_unchecked (caps,
+            i));
   s = g_string_sized_new (slen);
@@ -1818,7 +1827,7 @@
       g_string_append_c (s, ' ');
     priv_gst_structure_append_to_gstring (structure, s);
   if (s->len && s->str[s->len - 1] == ';') {
Index: gstobject.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstobject.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- gstobject.c	28 Aug 2008 20:12:54 -0000	1.130
+++ gstobject.c	6 Nov 2008 15:09:33 -0000	1.131
@@ -621,7 +621,7 @@
   if (strncmp (type_name, "Gst", 3) == 0)
     type_name += 3;
   tmp = g_strdup_printf ("%s%d", type_name, count);
-  name = g_ascii_strdown (tmp, strlen (tmp));
+  name = g_ascii_strdown (tmp, -1);
   g_free (tmp);
   result = gst_object_set_name (object, name);
Index: gststructure.c
RCS file: /cvs/gstreamer/gstreamer/gst/gststructure.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- gststructure.c	5 Nov 2008 16:57:35 -0000	1.101
+++ gststructure.c	6 Nov 2008 15:09:34 -0000	1.102
@@ -118,7 +118,7 @@
   structure->name = quark;
   structure->parent_refcount = NULL;
   structure->fields =
-      g_array_sized_new (FALSE, TRUE, sizeof (GstStructureField), prealloc);
+      g_array_sized_new (FALSE, FALSE, sizeof (GstStructureField), prealloc);
   return structure;
Index: gstvalue.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstvalue.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- gstvalue.c	5 Nov 2008 16:57:35 -0000	1.146
+++ gstvalue.c	6 Nov 2008 15:09:34 -0000	1.147
@@ -157,7 +157,8 @@
   /* our fundamental types that are certainly not fixed */
   if (type == GST_TYPE_INT_RANGE || type == GST_TYPE_DOUBLE_RANGE ||
-      type == GST_TYPE_LIST || type == GST_TYPE_FRACTION_RANGE) {
+      type == GST_TYPE_LIST || type == GST_TYPE_FRACTION_RANGE ||
+      type == GST_TYPE_ARRAY) {
   /* other (boxed) types that are fixed */
@@ -3341,6 +3342,9 @@
 {
   GType type = G_VALUE_TYPE (value);
+  if (gst_type_is_fixed (type))
+    return TRUE;
   if (type == GST_TYPE_ARRAY) {
     gint size, n;
     const GValue *kid;
@@ -3355,7 +3359,7 @@
     return TRUE;
-  return gst_type_is_fixed (type);
+  return FALSE;
 /************

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Thu Nov 06 2008  15:37:30 UTC

Log message:
* gst/gstvalue.c: (gst_type_is_fixed), (gst_value_is_fixed):
Reorganize some more, be more conservative with the GST_TYPE_ARRAY not
being fixed and inline the trivial check.

Modified files:
    .               : ChangeLog
    gst             : gstvalue.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4144&r2=1.4145
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstvalue.c.diff?r1=1.147&r2=1.148

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4144
retrieving revision 1.4145
diff -u -d -r1.4144 -r1.4145
--- ChangeLog	6 Nov 2008 15:09:31 -0000	1.4144
+++ ChangeLog	6 Nov 2008 15:37:14 -0000	1.4145
@@ -1,5 +1,11 @@
 2008-11-06  Wim Taymans  <wim.taymans@...>
 
+	* gst/gstvalue.c: (gst_type_is_fixed), (gst_value_is_fixed):
+	Reorganize some more, be more conservative with the GST_TYPE_ARRAY not
+	being fixed and inline the trivial check.
+
+2008-11-06  Wim Taymans  <wim.taymans@...>
 	* gst/gstcaps.c: (gst_caps_copy), (_gst_caps_free),
 	(gst_caps_merge_structure), (gst_caps_get_structure),
 	(gst_caps_copy_nth), (gst_caps_set_simple),
Index: gstvalue.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstvalue.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- gstvalue.c	6 Nov 2008 15:09:34 -0000	1.147
+++ gstvalue.c	6 Nov 2008 15:37:16 -0000	1.148
@@ -157,8 +157,7 @@
   }
   /* our fundamental types that are certainly not fixed */
   if (type == GST_TYPE_INT_RANGE || type == GST_TYPE_DOUBLE_RANGE ||
-      type == GST_TYPE_LIST || type == GST_TYPE_FRACTION_RANGE ||
-      type == GST_TYPE_ARRAY) {
+      type == GST_TYPE_LIST || type == GST_TYPE_FRACTION_RANGE) {
     return FALSE;
   /* other (boxed) types that are fixed */
@@ -3342,8 +3341,10 @@
 {
   GType type = G_VALUE_TYPE (value);
-  if (gst_type_is_fixed (type))
+  /* the most common types are just basic plain glib types */
+  if (type <= G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_GLIB_LAST)) {
     return TRUE;
+  }
   if (type == GST_TYPE_ARRAY) {
     gint size, n;
@@ -3358,8 +3359,7 @@
     }
-
-  return FALSE;
+  return gst_type_is_fixed (type);
 }
 /************

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Tue Nov 18 2008  09:52:55 UTC

Log message:
* gst/gstbuffer.h:
Document the free_func.

Modified files:
    .               : ChangeLog
    gst             : gstbuffer.h

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4158&r2=1.4159
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbuffer.h.diff?r1=1.123&r2=1.124

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4158
retrieving revision 1.4159
diff -u -d -r1.4158 -r1.4159
--- ChangeLog	17 Nov 2008 21:43:05 -0000	1.4158
+++ ChangeLog	18 Nov 2008 09:52:38 -0000	1.4159
@@ -1,3 +1,8 @@
+2008-11-18  Wim Taymans  <wim.taymans@...>
+
+	* gst/gstbuffer.h:
+	Document the free_func.
 2008-11-17  Sebastian Dröge  <sebastian.droege@...>
 
 	* libs/gst/controller/gstinterpolation.c:
Index: gstbuffer.h
RCS file: /cvs/gstreamer/gstreamer/gst/gstbuffer.h,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- gstbuffer.h	8 Oct 2008 08:54:55 -0000	1.123
+++ gstbuffer.h	18 Nov 2008 09:52:41 -0000	1.124
@@ -247,7 +247,9 @@
  * @offset_end: the last offset contained in this buffer. It has the same 
  *     format as @offset.
  * @malloc_data: a pointer to the allocated memory associated with this buffer.
- *     When the buffer is freed, this data will freed with g_free().
+ *     When the buffer is freed, this data will freed with @free_func.
+ * @free_func: a custom function that will be called with @malloc_data, defaults
+ *     to g_free(). Since 0.10.22.
  *
  * The structure of a #GstBuffer. Use the associated macros to access the public
  * variables.
@@ -273,7 +275,7 @@
   guint8                *malloc_data;
-  GFreeFunc		free_func;
+  GFreeFunc              free_func;
   /*< private >*/
   gpointer _gst_reserved[GST_PADDING - 1];

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Wed Nov 19 2008  12:06:55 UTC

Log message:
* gst/gstbin.c: (_gst_boolean_accumulator), (gst_bin_class_init),
(gst_bin_recalculate_latency), (gst_bin_do_latency_func),
(gst_bin_change_state_func):
* gst/gstbin.h:
Add do-latency signal with the old default fallback implementation. This
allows for custom latency calculations for when the default is not
sufficient.
API: GstBin::do-latency signal.

Modified files:
    .               : ChangeLog
    gst             : gstbin.c gstbin.h

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4161&r2=1.4162
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbin.c.diff?r1=1.389&r2=1.390
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbin.h.diff?r1=1.99&r2=1.100

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4161
retrieving revision 1.4162
diff -u -d -r1.4161 -r1.4162
--- ChangeLog	18 Nov 2008 13:36:28 -0000	1.4161
+++ ChangeLog	19 Nov 2008 12:06:38 -0000	1.4162
@@ -1,3 +1,14 @@
+2008-11-19  Wim Taymans  <wim.taymans@...>
+
+	* gst/gstbin.c: (_gst_boolean_accumulator), (gst_bin_class_init),
+	(gst_bin_recalculate_latency), (gst_bin_do_latency_func),
+	(gst_bin_change_state_func):
+	* gst/gstbin.h:
+	Add do-latency signal with the old default fallback implementation. This
+	allows for custom latency calculations for when the default is not
+	sufficient.
+	API: GstBin::do-latency signal.
 2008-11-18  Wim Taymans  <wim.taymans@...>
 
 	* win32/common/libgstreamer.def:
Index: gstbin.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstbin.c,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -d -r1.389 -r1.390
--- gstbin.c	18 Nov 2008 09:58:33 -0000	1.389
+++ gstbin.c	19 Nov 2008 12:06:41 -0000	1.390
@@ -241,6 +241,8 @@
     GstMessage * message, GstBin * bin);
 static gboolean gst_bin_query (GstElement * element, GstQuery * query);
+static gboolean gst_bin_do_latency_func (GstBin * bin);
 #ifndef GST_DISABLE_LOADSAVE
 static xmlNodePtr gst_bin_save_thyself (GstObject * object, xmlNodePtr parent);
 static void gst_bin_restore_thyself (GstObject * object, xmlNodePtr self);
@@ -259,6 +261,7 @@
 {
   ELEMENT_ADDED,
   ELEMENT_REMOVED,
+  DO_LATENCY,
   LAST_SIGNAL
 };
@@ -378,6 +381,22 @@
   iface->get_child_by_index = gst_bin_child_proxy_get_child_by_index;
 }
+static gboolean
+_gst_boolean_accumulator (GSignalInvocationHint * ihint,
+    GValue * return_accu, const GValue * handler_return, gpointer dummy)
+{
+  gboolean myboolean;
+  myboolean = g_value_get_boolean (handler_return);
+  if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
+    g_value_set_boolean (return_accu, myboolean);
+  GST_DEBUG ("invocation %d, %d", ihint->run_type, myboolean);
+  /* stop emission */
+  return FALSE;
+}
 static void
 gst_bin_class_init (GstBinClass * klass)
@@ -433,6 +452,29 @@
       g_signal_new ("element-removed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstBinClass, element_removed), NULL,
       NULL, gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_ELEMENT);
+  /**
+   * GstBin::do-latency:
+   * @bin: the #GstBin
+   *
+   * Will be emitted when the bin needs to perform latency calculations. This
+   * signal is only emited for toplevel bins or when async-handling is
+   * enabled.
+   * Only one signal handler is invoked. If no signals are connected, the
+   * default handler is invoked, which will query and distribute the lowest
+   * possible latency to all sinks.
+   * Connect to this signal if the default latency calculations are not
+   * sufficient, like when you need different latencies for different sinks in
+   * the same pipeline.
+   * Since: 0.10.22
+   */
+  gst_bin_signals[DO_LATENCY] =
+      g_signal_new ("do-latency", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstBinClass, do_latency),
+      _gst_boolean_accumulator, NULL, gst_marshal_BOOLEAN__VOID,
+      G_TYPE_BOOLEAN, 0, G_TYPE_NONE);
   gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_bin_dispose);
@@ -457,6 +499,8 @@
   klass->remove_element = GST_DEBUG_FUNCPTR (gst_bin_remove_func);
   klass->handle_message = GST_DEBUG_FUNCPTR (gst_bin_handle_message_func);
+  klass->do_latency = GST_DEBUG_FUNCPTR (gst_bin_do_latency_func);
   GST_DEBUG ("creating bin thread pool");
   err = NULL;
   klass->pool =
@@ -2086,6 +2130,9 @@
  * This method is typically called on the pipeline when a #GST_MESSAGE_LATENCY
  * is posted on the bus.
  *
+ * This function simply emits the 'do-latency' signal so any custom latency
+ * calculations will be performed.
+ *
  * Returns: %TRUE if the latency could be queried and reconfigured.
  * Since: 0.10.22.
@@ -2093,6 +2140,17 @@
 gboolean
 gst_bin_recalculate_latency (GstBin * bin)
+  gboolean res;
+  g_signal_emit (G_OBJECT (bin), gst_bin_signals[DO_LATENCY], 0, &res);
+  GST_DEBUG_OBJECT (bin, "latency returned %d", res);
+  return res;
+gst_bin_do_latency_func (GstBin * bin)
   GstQuery *query;
   GstElement *element;
   GstClockTime min_latency, max_latency;
Index: gstbin.h
RCS file: /cvs/gstreamer/gstreamer/gst/gstbin.h,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- gstbin.h	18 Nov 2008 09:58:33 -0000	1.99
+++ gstbin.h	19 Nov 2008 12:06:41 -0000	1.100
@@ -151,7 +151,11 @@
   void		(*handle_message)	(GstBin *bin, GstMessage *message);
   /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
+  /* signal added 0.10.22 */
+  gboolean	(*do_latency)           (GstBin *bin);
+  /*< private >*/
+  gpointer _gst_reserved[GST_PADDING-1];
 GType		gst_bin_get_type		(void);

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Thu Nov 20 2008  10:36:04 UTC

Log message:
* gst/gstquery.c:
* gst/gstquery.h:
Add GstQueryType for custom queries instead of having to use the
not-so-very-convenient registration infrastructure to register new
types.

Modified files:
    .               : ChangeLog
    gst             : gstquery.c gstquery.h

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4163&r2=1.4164
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstquery.c.diff?r1=1.47&r2=1.48
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstquery.h.diff?r1=1.40&r2=1.41

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4163
retrieving revision 1.4164
diff -u -d -r1.4163 -r1.4164
--- ChangeLog	19 Nov 2008 12:20:01 -0000	1.4163
+++ ChangeLog	20 Nov 2008 10:35:47 -0000	1.4164
@@ -1,3 +1,11 @@
+2008-11-20  Wim Taymans  <wim.taymans@...>
+
+	* gst/gstquery.c:
+	* gst/gstquery.h:
+	Add GstQueryType for custom queries instead of having to use the
+	not-so-very-convenient registration infrastructure to register new
+	types.
 2008-11-19  Sebastian Dröge  <sebastian.droege@...>
 
 	Patch by: Andrew Feren <acferen at yahoo dot com>
Index: gstquery.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstquery.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- gstquery.c	27 Aug 2008 03:04:23 -0000	1.47
+++ gstquery.c	20 Nov 2008 10:35:50 -0000	1.48
@@ -92,6 +92,7 @@
   {GST_QUERY_CONVERT, "convert", "Converting between formats", 0},
   {GST_QUERY_FORMATS, "formats", "Supported formats for conversion", 0},
   {GST_QUERY_BUFFERING, "buffering", "Buffering status", 0},
+  {GST_QUERY_CUSTOM, "custom", "Custom query", 0},
   {0, NULL, NULL, 0}
 };
Index: gstquery.h
RCS file: /cvs/gstreamer/gstreamer/gst/gstquery.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- gstquery.h	9 Apr 2008 13:15:33 -0000	1.40
+++ gstquery.h	20 Nov 2008 10:35:50 -0000	1.41
@@ -48,6 +48,8 @@
  * @GST_QUERY_FORMATS: query supported formats for convert
  * @GST_QUERY_BUFFERING: query available media for efficient seeking. Since
  * 0.10.20.
+ * @GST_QUERY_CUSTOM: a custom application or element defined query. Since
+ * 0.10.22.
  *
  * Standard predefined Query types
  */
@@ -64,7 +66,8 @@
   GST_QUERY_SEGMENT,
   GST_QUERY_CONVERT,
   GST_QUERY_FORMATS,
-  GST_QUERY_BUFFERING
+  GST_QUERY_BUFFERING,
+  GST_QUERY_CUSTOM
 } GstQueryType;
 /**

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Fri Nov 21 2008  16:49:02 UTC

Log message:
* gst/gstpad.c: (gst_pad_accept_caps):
Avoid getting the acceptcaps function too early.

Modified files:
    .               : ChangeLog
    gst             : gstpad.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4168&r2=1.4169
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpad.c.diff?r1=1.585&r2=1.586

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4168
retrieving revision 1.4169
diff -u -d -r1.4168 -r1.4169
--- ChangeLog	21 Nov 2008 08:08:56 -0000	1.4168
+++ ChangeLog	21 Nov 2008 16:48:45 -0000	1.4169
@@ -1,5 +1,10 @@
 2008-11-21  Wim Taymans  <wim.taymans@...>
 
+	* gst/gstpad.c: (gst_pad_accept_caps):
+	Avoid getting the acceptcaps function too early.
+
+2008-11-21  Wim Taymans  <wim.taymans@...>
 	* tools/gst-launch.c: (event_loop):
 	Make gst-launch handle LATENCY messages and make it recalculate the
 	latency.
Index: gstpad.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.c,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -d -r1.585 -r1.586
--- gstpad.c	20 Oct 2008 13:32:07 -0000	1.585
+++ gstpad.c	21 Nov 2008 16:48:48 -0000	1.586
@@ -2311,13 +2311,13 @@
   /* lock for checking the existing caps */
   GST_OBJECT_LOCK (pad);
-  acceptfunc = GST_PAD_ACCEPTCAPSFUNC (pad);
   GST_CAT_DEBUG_OBJECT (GST_CAT_CAPS, pad, "accept caps of %p", caps);
   /* The current caps on a pad are trivially acceptable */
   if (G_LIKELY ((existing = GST_PAD_CAPS (pad)))) {
     if (caps == existing || gst_caps_is_equal (caps, existing))
       goto is_same_caps;
   }
+  acceptfunc = GST_PAD_ACCEPTCAPSFUNC (pad);
   GST_OBJECT_UNLOCK (pad);
   if (G_LIKELY (acceptfunc)) {

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Thu Nov 27 2008  11:12:44 UTC

Log message:
Patch by: 이문형 <iwings at gmail dot com>
* gst/gstpoll.c: (gst_poll_fd_ctl_write), (gst_poll_fd_has_error):
Adds support for FD_CONNECT event (win32). See #562258.

Modified files:
    .               : ChangeLog
    gst             : gstpoll.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4177&r2=1.4178
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpoll.c.diff?r1=1.10&r2=1.11

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4177
retrieving revision 1.4178
diff -u -d -r1.4177 -r1.4178
--- ChangeLog	24 Nov 2008 20:02:53 -0000	1.4177
+++ ChangeLog	27 Nov 2008 11:12:27 -0000	1.4178
@@ -1,3 +1,10 @@
+2008-11-27  Wim Taymans  <wim.taymans@...>
+
+	Patch by: 이문형 <iwings at gmail dot com>
+	* gst/gstpoll.c: (gst_poll_fd_ctl_write), (gst_poll_fd_has_error):
+	Adds support for FD_CONNECT event (win32). See #562258.
 2008-11-24  Stefan Kost  <ensonic@...>
 
 	* libs/gst/base/gstbasesink.c:
Index: gstpoll.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstpoll.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gstpoll.c	13 Nov 2008 18:09:45 -0000	1.10
+++ gstpoll.c	27 Nov 2008 11:12:30 -0000	1.11
@@ -695,7 +695,8 @@
     else
       pfd->events &= ~POLLOUT;
 #else
-    gst_poll_update_winsock_event_mask (set, idx, FD_WRITE, active);
+    gst_poll_update_winsock_event_mask (set, idx, FD_WRITE | FD_CONNECT,
+        active);
 #endif
   }
@@ -873,7 +874,8 @@
     res = (wfd->events.iErrorCode[FD_CLOSE_BIT] != 0) ||
         (wfd->events.iErrorCode[FD_READ_BIT] != 0) ||
         (wfd->events.iErrorCode[FD_WRITE_BIT] != 0) ||
-        (wfd->events.iErrorCode[FD_ACCEPT_BIT] != 0);
+        (wfd->events.iErrorCode[FD_ACCEPT_BIT] != 0) ||
+        (wfd->events.iErrorCode[FD_CONNECT_BIT] != 0);

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Mon Jan 05 2009  10:14:43 UTC

Log message:
* gst/gstbin.c: (gst_bin_set_index_func), (gst_bin_set_clock_func),
(gst_bin_change_state_func):
Use an iterator to set the clock and the index so that we can release
the object lock appropriately. Fixes #566393.

Modified files:
    .               : ChangeLog
    gst             : gstbin.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4211&r2=1.4212
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbin.c.diff?r1=1.390&r2=1.391

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4211
retrieving revision 1.4212
diff -u -d -r1.4211 -r1.4212
--- ChangeLog	3 Jan 2009 18:39:36 -0000	1.4211
+++ ChangeLog	5 Jan 2009 10:14:27 -0000	1.4212
@@ -1,3 +1,10 @@
+2009-01-05  Wim Taymans  <wim.taymans@...>
+
+	* gst/gstbin.c: (gst_bin_set_index_func), (gst_bin_set_clock_func),
+	(gst_bin_change_state_func):
+	Use an iterator to set the clock and the index so that we can release
+	the object lock appropriately. Fixes #566393.
 2009-01-03  Edward Hervey  <edward.hervey@...>
 
 	* libs/gst/base/gstcollectpads.c: (gst_collect_pads_available):
Index: gstbin.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstbin.c,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -d -r1.390 -r1.391
--- gstbin.c	19 Nov 2008 12:06:41 -0000	1.390
+++ gstbin.c	5 Jan 2009 10:14:28 -0000	1.391
@@ -624,17 +624,40 @@
 gst_bin_set_index_func (GstElement * element, GstIndex * index)
 {
   GstBin *bin;
-  GList *children;
+  gboolean done;
+  GstIterator *it;
   bin = GST_BIN (element);
-  GST_OBJECT_LOCK (bin);
-  for (children = bin->children; children; children = g_list_next (children)) {
-    GstElement *child = GST_ELEMENT (children->data);
+  it = gst_bin_iterate_elements (bin);
-    gst_element_set_index (child, index);
+  done = FALSE;
+  while (!done) {
+    gpointer data;
+    switch (gst_iterator_next (it, &data)) {
+      case GST_ITERATOR_OK:
+      {
+        GstElement *child = GST_ELEMENT_CAST (data);
+        GST_DEBUG_OBJECT (bin, "setting index on %s", GST_ELEMENT_NAME (child));
+        gst_element_set_index (child, index);
+        gst_object_unref (child);
+        break;
+      }
+      case GST_ITERATOR_RESYNC:
+        GST_DEBUG_OBJECT (bin, "iterator doing resync");
+        gst_iterator_resync (it);
+      default:
+      case GST_ITERATOR_DONE:
+        GST_DEBUG_OBJECT (bin, "iterator done");
+        done = TRUE;
+    }
   }
-  GST_OBJECT_UNLOCK (bin);
+  gst_iterator_free (it);
 }
 /* set the clock on all elements in this bin
@@ -644,21 +667,42 @@
 static gboolean
 gst_bin_set_clock_func (GstElement * element, GstClock * clock)
   gboolean res = TRUE;
-  if (element->clock != clock) {
-    for (children = bin->children; children; children = g_list_next (children)) {
-      GstElement *child = GST_ELEMENT (children->data);
-      res &= gst_element_set_clock (child, clock);
+        res &= gst_element_set_clock (child, clock);
+        res = TRUE;
     }
   return res;

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Mon Jan 05 2009  15:41:15 UTC

Log message:
* gst/gstbus.c: (gst_bus_wakeup_main_context):
The lock order should be maincontext > OBJECT_LOCK so we need to release
the object lock when waking up the mainloop to avoid deadlocks.

Modified files:
    .               : ChangeLog
    gst             : gstbus.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4212&r2=1.4213
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbus.c.diff?r1=1.69&r2=1.70

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4212
retrieving revision 1.4213
diff -u -d -r1.4212 -r1.4213
--- ChangeLog	5 Jan 2009 10:14:27 -0000	1.4212
+++ ChangeLog	5 Jan 2009 15:40:58 -0000	1.4213
@@ -1,5 +1,11 @@
 2009-01-05  Wim Taymans  <wim.taymans@...>
 
+	* gst/gstbus.c: (gst_bus_wakeup_main_context):
+	The lock order should be maincontext > OBJECT_LOCK so we need to release
+	the object lock when waking up the mainloop to avoid deadlocks.
+
+2009-01-05  Wim Taymans  <wim.taymans@...>
 	* gst/gstbin.c: (gst_bin_set_index_func), (gst_bin_set_clock_func),
 	(gst_bin_change_state_func):
 	Use an iterator to set the clock and the index so that we can release
Index: gstbus.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstbus.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- gstbus.c	27 Dec 2008 17:41:11 -0000	1.69
+++ gstbus.c	5 Jan 2009 15:41:00 -0000	1.70
@@ -298,9 +298,17 @@
 static void
 gst_bus_wakeup_main_context (GstBus * bus)
 {
+  GMainContext *ctx;
   GST_OBJECT_LOCK (bus);
-  g_main_context_wakeup (bus->priv->main_context);
+  if ((ctx = bus->priv->main_context))
+    g_main_context_ref (ctx);
   GST_OBJECT_UNLOCK (bus);
+  g_main_context_wakeup (ctx);
+  if (ctx)
+    g_main_context_unref (ctx);
 }

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Thu Jan 15 2009  10:04:51 UTC

Log message:
Patch by: Jonas Holmberg <jonas dot holmberg at axis dot com>
* gst/gstpad.h:
A small documentation fix.

Modified files:
    .               : ChangeLog
    gst             : gstpad.h

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4221&r2=1.4222
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpad.h.diff?r1=1.222&r2=1.223

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4221
retrieving revision 1.4222
diff -u -d -r1.4221 -r1.4222
--- ChangeLog	11 Jan 2009 09:46:50 -0000	1.4221
+++ ChangeLog	15 Jan 2009 10:04:35 -0000	1.4222
@@ -1,3 +1,10 @@
+2009-01-15  Wim Taymans  <wim.taymans@...>
+
+	Patch by: Jonas Holmberg <jonas dot holmberg at axis dot com>
+	* gst/gstpad.h:
+	A small documentation fix.
 2009-01-11  Sebastian Dröge  <sebastian.droege@...>
 
 	* gst/gstutils.h:
Index: gstpad.h
RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.h,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -d -r1.222 -r1.223
--- gstpad.h	1 Sep 2008 10:42:04 -0000	1.222
+++ gstpad.h	15 Jan 2009 10:04:37 -0000	1.223
@@ -225,7 +225,7 @@
  * gst_buffer_unref() when the buffer is no longer needed.
  *
  * When a chain function detects an error in the data stream, it must post an
- * error on the buffer and return an appropriate #GstFlowReturn value.
+ * error on the bus and return an appropriate #GstFlowReturn value.
  * Returns: #GST_FLOW_OK for success
  */