2007-08-16 Wim Taymans <wim.taymans@gmail.com>
+ * gst/gstbin.c: (is_eos), (gst_bin_add_func),
+ (bin_handle_async_start), (gst_bin_handle_message_func):
+ Improve debugging.
+ When adding elements, insert messages into the bus of the newly added
+ element and make sure the element is the source of the message. This
+ allows the parent bin to intercept the message and do the
+ right thing. It also avoids us posting ASYNC_START and CLOCK_PROVIDE
+ messages to the app (which is not allowed).
+ Update some docs.
+
+ * tests/check/gst/gstghostpad.c: (GST_START_TEST):
+ Fix testsuite so that is does not work around messages that should not
+ have been posted in the first place.
+
+2007-08-16 Wim Taymans <wim.taymans@gmail.com>
+
* gst/gstbin.c: (add_to_queue), (remove_from_queue), (clear_queue),
(update_degree), (gst_bin_sort_iterator_next):
Fix annoying bug in the sorted iterator where a sink that is not really
2007-08-14 Wim Taymans <wim.taymans@gmail.com>
+
* gst/gstbin.c: (gst_bin_add_func), (gst_bin_element_set_state),
(bin_handle_async_start), (gst_bin_handle_message_func):
Move ASYNC_START message posting to where it belongs, similar to
if (bin_element_is_sink (element, bin) == 0) {
/* check if element posted EOS */
if (find_message (bin, GST_OBJECT_CAST (element), GST_MESSAGE_EOS)) {
- GST_DEBUG ("element posted EOS");
+ GST_DEBUG ("sink '%s' posted EOS", GST_ELEMENT_NAME (element));
} else {
- GST_DEBUG ("element did not post EOS yet");
+ GST_DEBUG ("sink '%s' did not post EOS yet",
+ GST_ELEMENT_NAME (element));
result = FALSE;
break;
}
gchar *elem_name;
GstIterator *it;
gboolean is_sink;
- GstMessage *clock_message = NULL;
+ GstMessage *clock_message = NULL, *async_message = NULL;
GstStateChangeReturn ret;
GST_DEBUG_OBJECT (bin, "element :%s", GST_ELEMENT_NAME (element));
}
if (gst_element_provides_clock (element)) {
GST_DEBUG_OBJECT (bin, "element \"%s\" can provide a clock", elem_name);
- bin->clock_dirty = TRUE;
clock_message =
- gst_message_new_clock_provide (GST_OBJECT_CAST (bin), NULL, TRUE);
+ gst_message_new_clock_provide (GST_OBJECT_CAST (element), NULL, TRUE);
}
bin->children = g_list_prepend (bin->children, element);
if (ret == GST_STATE_CHANGE_FAILURE)
goto no_state_recalc;
+ /* distribute the bus */
+ gst_element_set_bus (element, bin->child_bus);
+
+ /* propagate the current base_time and clock */
+ gst_element_set_base_time (element, GST_ELEMENT (bin)->base_time);
+ /* it's possible that the element did not accept the clock but
+ * that is not important right now. When the pipeline goes to PLAYING,
+ * a new clock will be selected */
+ gst_element_set_clock (element, GST_ELEMENT_CLOCK (bin));
+
/* update the bin state, the new element could have been an ASYNC or
* NO_PREROLL element */
ret = GST_STATE_RETURN (element);
switch (ret) {
case GST_STATE_CHANGE_ASYNC:
- bin_handle_async_start (bin, FALSE);
+ {
+ /* create message to track this aync element when it posts an async-done
+ * message */
+ async_message =
+ gst_message_new_async_start (GST_OBJECT_CAST (element), FALSE);
break;
+ }
case GST_STATE_CHANGE_NO_PREROLL:
+ /* ignore all async elements we might have and commit our state */
bin_handle_async_done (bin, ret);
break;
case GST_STATE_CHANGE_FAILURE:
}
no_state_recalc:
- /* distribute the bus */
- gst_element_set_bus (element, bin->child_bus);
-
- /* propagate the current base_time and clock */
- gst_element_set_base_time (element, GST_ELEMENT (bin)->base_time);
- /* it's possible that the element did not accept the clock but
- * that is not important right now. When the pipeline goes to PLAYING,
- * a new clock will be selected */
- gst_element_set_clock (element, GST_ELEMENT_CLOCK (bin));
GST_OBJECT_UNLOCK (bin);
+ /* post the messages on the bus of the element so that the bin can handle
+ * them */
if (clock_message)
- gst_element_post_message (GST_ELEMENT_CAST (bin), clock_message);
+ gst_element_post_message (GST_ELEMENT_CAST (element), clock_message);
+
+ if (async_message)
+ gst_element_post_message (GST_ELEMENT_CAST (element), async_message);
/* unlink all linked pads */
it = gst_element_iterate_pads (element);
if (GST_STATE_RETURN (bin) == GST_STATE_CHANGE_NO_PREROLL)
goto was_no_preroll;
+
old_state = GST_STATE (bin);
/* when we PLAYING we go back to PAUSED, when preroll happens, we go back to
* in the PLAYING state. If all sinks posted the EOS message, post
* one upwards.
*
- * GST_MESSAGE_STATE_DIRTY: if we are the toplevel bin we do a state
- * recalc. If we are not toplevel (we have a parent) we just post
- * the message upwards. This makes sure only the toplevel bin will
- * run over all its children to check if a state change happened.
+ * GST_MESSAGE_STATE_DIRTY: Deprecated
*
* GST_MESSAGE_SEGMENT_START: just collect, never forward upwards. If an
* element posts segment_start twice, only the last message is kept.
*
* GST_MESSAGE_ASYNC_START: Create an internal ELEMENT message that stores
* the state of the element and the fact that the element will need a
- * new base_time.
+ * new base_time. This message is not forwarded to the application.
*
* GST_MESSAGE_ASYNC_DONE: Find the internal ELEMENT message we kept for the
* element when it posted ASYNC_START. If all elements are done, post a
/* nothing found, remove all old ASYNC_DONE messages */
bin_remove_messages (bin, NULL, GST_MESSAGE_ASYNC_DONE);
+ GST_DEBUG_OBJECT (bin, "async elements commited");
bin_handle_async_done (bin, GST_STATE_CHANGE_SUCCESS);
}
GST_OBJECT_UNLOCK (bin);
ASSERT_OBJECT_REFCOUNT (b1, "pipeline", 1);
ASSERT_OBJECT_REFCOUNT (b2, "bin", 1);
fail_unless (gst_bin_add (GST_BIN (b1), b2));
- /* adding the bin creates a clock provide message with a ref to pipeline */
- ASSERT_OBJECT_REFCOUNT (b1, "pipeline", 2);
+ ASSERT_OBJECT_REFCOUNT (b1, "pipeline", 1);
ASSERT_OBJECT_REFCOUNT (b2, "bin", 1);
sinkpad = gst_element_get_pad (sink, "sink");
gst_object_unref (sinkpad);
/* now remove the bin with the ghostpad, b2 is disposed now. */
- ASSERT_OBJECT_REFCOUNT (b1, "pipeline", 2);
+ ASSERT_OBJECT_REFCOUNT (b1, "pipeline", 1);
ASSERT_OBJECT_REFCOUNT (b2, "bin", 1);
gst_bin_remove (GST_BIN (b1), b2);
fail_if (gst_pad_is_linked (srcpad));
gst_object_unref (srcpad);
- /* flush the message, dropping the b1 refcount to 1 */
- gst_element_set_state (b1, GST_STATE_READY);
- gst_element_set_state (b1, GST_STATE_NULL);
ASSERT_OBJECT_REFCOUNT (b1, "pipeline", 1);
gst_object_unref (b1);
}
srcbin = GST_BIN (gst_bin_new ("srcbin"));
gst_bin_add (pipeline, GST_ELEMENT (srcbin));
- ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 2); /* provide-clock msg */
+ ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 1);
sinkbin = GST_BIN (gst_bin_new ("sinkbin"));
gst_bin_add (pipeline, GST_ELEMENT (sinkbin));
- ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 3); /* provide-clock msg */
+ ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 1);
src = gst_element_factory_make ("fakesrc", "src");
gst_bin_add (srcbin, src);
fail_unless (GST_PAD_PEER (target) != NULL);
gst_object_unref (target);
- /* flush the message, dropping the b1 refcount to 1 */
- gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_READY);
- gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 1);
gst_object_unref (pipeline);
projects / platform / upstream / gstreamer.git / commitdiff