mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

composition: Add an internal bin where that contain used children

Browse source 
Co-Authored by: Mathieu Duponchelle <mathieu.duponchelle@opencreed.com>
This commit is contained in:
Thibault Saunier 2014-07-02 21:01:31 +02:00
parent d8ca412cd9
commit 74c30001f9
10 changed files with 200 additions and 322 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

400
gnl/gnlcomposition.c
View file

@ -169,6 +169,8 @@ struct _GnlCompositionPrivate
GstState deactivated_elements_state;
gboolean external_gst_bin_add_remove; /* When people try to call gst_bin_add/remove themselves */
GstElement *current_bin;
};
static guint _signals[LAST_SIGNAL] = { 0 };
@ -217,9 +219,7 @@ static void update_start_stop_duration (GnlComposition * comp);
static gboolean
gnl_composition_event_handler (GstPad * ghostpad, GstObject * parent,
GstEvent * event);
static void
compare_relink_single_node (GnlComposition * comp, GNode * node,
GNode * oldstack);
static void _relink_single_node (GnlComposition * comp, GNode * node, GstEvent *toplevel_seek);
static gboolean update_pipeline_func (GnlComposition * comp);
static gboolean commit_pipeline_func (GnlComposition * comp);
static gboolean lock_child_state (GValue * item, GValue * ret,
@ -228,6 +228,10 @@ static gboolean
set_child_caps (GValue * item, GValue * ret G_GNUC_UNUSED, GnlObject * comp);
static GstEvent *get_new_seek_event (GnlComposition * comp, gboolean initial,
gboolean updatestoponly);
static gboolean
_gnl_composition_add_entry (GnlComposition * comp, GnlObject * object);
static gboolean
_gnl_composition_remove_entry (GnlComposition * comp, GnlObject * object);
/* COMP_REAL_START: actual position to start current playback at. */
@ -605,6 +609,8 @@ _add_remove_object_gsource (GnlComposition * comp, GnlObject * object)
static gboolean
remove_object_handler (GnlComposition * comp, GnlObject * object)
{
g_return_val_if_fail (GNL_IS_OBJECT (object), FALSE);
_add_remove_object_gsource (comp, object);
return TRUE;
@ -663,6 +669,8 @@ _add_add_object_gsource (GnlComposition * comp, GnlObject * object)
static gboolean
add_object_handler (GnlComposition * comp, GnlObject * object)
{
g_return_val_if_fail (GNL_IS_OBJECT (object), FALSE);
_add_add_object_gsource (comp, object);
return TRUE;
@ -836,6 +844,11 @@ gnl_composition_init (GnlComposition * comp)
comp->priv = priv;
GST_ERROR_OBJECT (comp, "HERE");
priv->current_bin = gst_bin_new ("current-bin");
gst_bin_add (GST_BIN (comp), priv->current_bin);
GST_ERROR_OBJECT (comp, "There");
gnl_composition_reset (comp);
priv->gnl_event_pad_func = GST_PAD_EVENTFUNC (GNL_OBJECT_SRC (comp));
@ -967,7 +980,7 @@ unblock_children (GnlComposition * comp)
{
GstIterator *children;
children = gst_bin_iterate_elements (GST_BIN (comp));
children = gst_bin_iterate_elements (GST_BIN (comp->priv->current_bin));
retry:
if (G_UNLIKELY (gst_iterator_fold (children,
@ -1021,7 +1034,8 @@ reset_children (GnlComposition * comp)
{
GstIterator *children;
children = gst_bin_iterate_elements (GST_BIN (comp));
children = gst_bin_iterate_elements (GST_BIN (comp->priv->current_bin));
retry:
if (G_UNLIKELY (gst_iterator_fold (children,
(GstIteratorFoldFunction) reset_child, NULL,
@ -2110,10 +2124,12 @@ _process_pending_entry (GnlObject * object,
GnlCompositionEntry *entry = COMP_ENTRY (comp, object);
comp->priv->external_gst_bin_add_remove = FALSE;
if (entry)
gst_bin_remove (GST_BIN (comp), GST_ELEMENT (object));
else
gst_bin_add (GST_BIN (comp), GST_ELEMENT (object));
if (entry) {
_gnl_composition_remove_entry (comp, object);
} else {
_gnl_composition_add_entry (comp, object);
}
comp->priv->external_gst_bin_add_remove = TRUE;
return TRUE;
@ -2230,7 +2246,7 @@ gnl_composition_change_state (GstElement * element, GstStateChange transition)
GST_DEBUG_OBJECT (comp,
"Setting all children to READY and locking their state");
children = gst_bin_iterate_elements (GST_BIN (comp));
children = gst_bin_iterate_elements (GST_BIN (comp->priv->current_bin));
while (G_UNLIKELY (gst_iterator_fold (children,
(GstIteratorFoldFunction) lock_child_state, NULL,
@ -2241,7 +2257,7 @@ gnl_composition_change_state (GstElement * element, GstStateChange transition)
/* Set caps on all objects */
if (G_UNLIKELY (!gst_caps_is_any (GNL_OBJECT (comp)->caps))) {
children = gst_bin_iterate_elements (GST_BIN (comp));
children = gst_bin_iterate_elements (GST_BIN (comp->priv->current_bin));
while (G_UNLIKELY (gst_iterator_fold (children,
(GstIteratorFoldFunction) set_child_caps, NULL,
@ -2458,7 +2474,7 @@ _link_to_parent (GnlComposition * comp, GnlObject * newobj,
static void
_relink_children_recursively (GnlComposition * comp,
GnlObject * newobj, GNode * oldstack, GNode * node)
GnlObject * newobj, GNode * node, GstEvent *toplevel_seek)
{
GNode *child;
guint nbchildren = g_node_n_children (node);
@ -2472,7 +2488,7 @@ _relink_children_recursively (GnlComposition * comp,
g_object_set (G_OBJECT (newobj), "sinks", nbchildren, NULL);
for (child = node->children; child; child = child->next)
compare_relink_single_node (comp, child, oldstack);
_relink_single_node (comp, child, toplevel_seek);
if (G_UNLIKELY (nbchildren < oper->num_sinks))
GST_ERROR ("Not enough sinkpads to link all objects to the operation ! "
@ -2493,39 +2509,34 @@ _relink_children_recursively (GnlComposition * comp,
* WITH OBJECTS LOCK TAKEN
*/
static void
compare_relink_single_node (GnlComposition * comp, GNode * node,
GNode * oldstack)
_relink_single_node (GnlComposition * comp, GNode * node, GstEvent *toplevel_seek)
{
GNode *oldnode = NULL;
GnlObject *newobj;
GnlObject *newparent;
GstPad *srcpad = NULL, *sinkpad = NULL;
GnlCompositionEntry *entry;
GstEvent *translated_seek;
if (G_UNLIKELY (!node))
return;
newparent = G_NODE_IS_ROOT (node) ? NULL : (GnlObject *) node->parent->data;
newobj = (GnlObject *) node->data;
if (oldstack) {
oldnode = g_node_find (oldstack, G_IN_ORDER, G_TRAVERSE_ALL, newobj);
}
GST_DEBUG_OBJECT (comp, "newobj:%s",
GST_ELEMENT_NAME ((GstElement *) newobj));
srcpad = GNL_OBJECT_SRC (newobj);
/* Make sure the source pad is blocked for new objects */
if (G_UNLIKELY (!oldnode))
_object_block_and_drop_data (comp, newobj);
gst_bin_add (GST_BIN (comp->priv->current_bin), GST_ELEMENT_CAST (newobj));
gst_element_sync_state_with_parent (GST_ELEMENT_CAST (newobj));
entry = COMP_ENTRY (comp, newobj);
translated_seek = gnl_object_translate_incoming_seek (newobj, toplevel_seek);
gst_element_send_event (GST_ELEMENT (newobj), translated_seek);
/* link to parent if needed. */
if (newparent) {
if (_parent_or_priority_changed (newobj, oldnode, newparent, node))
_link_to_parent (comp, newobj, newparent);
_link_to_parent (comp, newobj, newparent);
/* If there's an operation, inform it about priority changes */
sinkpad = gst_pad_get_peer (srcpad);
@ -2536,136 +2547,36 @@ compare_relink_single_node (GnlComposition * comp, GNode * node,
/* Handle children */
if (GNL_IS_OPERATION (newobj))
_relink_children_recursively (comp, newobj, oldstack, node);
/* Unblock source pad */
if (!G_NODE_IS_ROOT (node) && entry->probeid) {
GST_LOG_OBJECT (comp, "Unblocking pad %s:%s", GST_DEBUG_PAD_NAME (srcpad));
gst_pad_remove_probe (srcpad, entry->probeid);
entry->probeid = 0;
}
_relink_children_recursively (comp, newobj, node, toplevel_seek);
GST_LOG_OBJECT (comp, "done with object %s",
GST_ELEMENT_NAME (GST_ELEMENT (newobj)));
}
/*
* recursive depth-first compare stack function on old stack
*
* _ Add no-longer used objects to the deactivate list
* _ unlink child-parent relations that have changed (not same parent, or not same order)
* _ blocks available source pads
*
* FIXME : modify is only used for the root element.
* It is TRUE all the time except when the update is done from a seek
*
* WITH OBJECTS LOCK TAKEN
*/
static GList *
compare_deactivate_single_node (GnlComposition * comp, GNode * node,
GNode * newstack, gboolean modify)
static gboolean
_remove_child (GValue * item, GValue * ret G_GNUC_UNUSED, GstBin * bin)
{
GNode *child;
GNode *newnode = NULL; /* Same node in newstack */
GnlObject *oldparent;
GList *deactivate = NULL;
GnlObject *oldobj = NULL;
GstPad *srcpad = NULL;
GstPad *peerpad = NULL;
GstElement *child = g_value_get_object (item);
if (G_UNLIKELY (!node))
return NULL;
gst_bin_remove (bin, child);
/* The former parent GnlObject (i.e. downstream) of the given node */
oldparent = G_NODE_IS_ROOT (node) ? NULL : (GnlObject *) node->parent->data;
return TRUE;
}
/* The former GnlObject */
oldobj = (GnlObject *) node->data;
static void
_empty_bin (GstBin * bin)
{
GstIterator *children;
/* The node corresponding to oldobj in the new stack */
if (newstack)
newnode = g_node_find (newstack, G_IN_ORDER, G_TRAVERSE_ALL, oldobj);
children = gst_bin_iterate_elements (bin);
GST_DEBUG_OBJECT (comp, "oldobj:%s",
GST_ELEMENT_NAME ((GstElement *) oldobj));
srcpad = GNL_OBJECT_SRC (oldobj);
/* Block source pad
* This makes sure that no data/event flow will come out of this element after this
* point.
*/
_object_block_and_drop_data (comp, oldobj);
/* 2. If we have to modify or we have a parent, flush downstream
* This ensures the streaming thread going through the current object has
* either stopped or is blocking against the source pad. */
if ((modify || oldparent) && (peerpad = gst_pad_get_peer (srcpad))) {
GST_LOG_OBJECT (comp, "Sending flush start/stop downstream ");
gst_pad_send_event (peerpad, gst_event_new_flush_start ());
gst_pad_send_event (peerpad, gst_event_new_flush_stop (TRUE));
GST_DEBUG_OBJECT (comp, "DONE Sending flush events downstream");
gst_object_unref (peerpad);
while (G_UNLIKELY (gst_iterator_fold (children,
(GstIteratorFoldFunction) _remove_child, NULL,
bin) == GST_ITERATOR_RESYNC)) {
gst_iterator_resync (children);
}
/* 3. Unlink from the parent if we've changed position */
GST_LOG_OBJECT (comp,
"Checking if we need to unlink from downstream element");
if (G_UNLIKELY (!oldparent)) {
GST_LOG_OBJECT (comp, "Top-level object");
/* for top-level objects we just set the ghostpad target to NULL */
gnl_composition_ghost_pad_set_target (comp, NULL, NULL);
} else {
GnlObject *newparent = NULL;
GST_LOG_OBJECT (comp, "non-toplevel object");
if (newnode)
newparent =
G_NODE_IS_ROOT (newnode) ? NULL : (GnlObject *) newnode->parent->data;
if ((!newnode) || (oldparent != newparent) ||
(newparent &&
(g_node_child_index (node,
oldobj) != g_node_child_index (newnode, oldobj)))) {
GstPad *peerpad = NULL;
GST_LOG_OBJECT (comp, "Topology changed, unlinking from downstream");
if ((peerpad = gst_pad_get_peer (srcpad))) {
GST_LOG_OBJECT (peerpad, "Sending flush start/stop");
gst_pad_send_event (peerpad, gst_event_new_flush_start ());
gst_pad_send_event (peerpad, gst_event_new_flush_stop (TRUE));
gst_pad_unlink (srcpad, peerpad);
gst_object_unref (peerpad);
}
} else
GST_LOG_OBJECT (comp, "Topology unchanged");
}
/* If we're dealing with an operation, call this method recursively on it */
if (G_UNLIKELY (GNL_IS_OPERATION (oldobj))) {
GST_LOG_OBJECT (comp,
"Object is an operation, recursively calling on children");
for (child = node->children; child; child = child->next) {
GList *newdeac =
compare_deactivate_single_node (comp, child, newstack, modify);
if (newdeac)
deactivate = g_list_concat (deactivate, newdeac);
}
}
/* If object isn't used anymore, add it to the list of objects to deactivate */
if (G_LIKELY (!newnode)) {
GST_LOG_OBJECT (comp, "Object doesn't exist in new stack");
deactivate = g_list_prepend (deactivate, oldobj);
}
GST_LOG_OBJECT (comp, "done with object %s",
GST_ELEMENT_NAME (GST_ELEMENT (oldobj)));
return deactivate;
gst_iterator_free (children);
}
/*
@ -2684,14 +2595,21 @@ compare_deactivate_single_node (GnlComposition * comp, GNode * node,
static GList *
compare_relink_stack (GnlComposition * comp, GNode * stack, gboolean modify)
{
GstEvent *toplevel_seek = get_new_seek_event (comp, TRUE, FALSE);
GList *deactivate = NULL;
/* 1. Traverse old stack to deactivate no longer used objects */
deactivate =
compare_deactivate_single_node (comp, comp->priv->current, stack, modify);
gst_element_set_locked_state (comp->priv->current_bin, TRUE);
/* 2. Traverse new stack to do needed (re)links */
compare_relink_single_node (comp, stack, comp->priv->current);
GST_ERROR ("Set state return: %s",
gst_element_state_change_return_get_name
(gst_element_set_state (comp->priv->current_bin, GST_STATE_READY)));
_empty_bin (GST_BIN_CAST (comp->priv->current_bin));
_relink_single_node (comp, stack, toplevel_seek);
gst_element_set_locked_state (comp->priv->current_bin, FALSE);
gst_element_sync_state_with_parent (comp->priv->current_bin);
return deactivate;
}
@ -2755,44 +2673,9 @@ beach:
return res;
}
static inline void
_deactivate_current_stack (GnlComposition * comp, GList * todeactivate)
{
GList *tmp;
GstElement *element;
GnlCompositionPrivate *priv = comp->priv;
/* Invalidate current stack */
if (priv->current)
g_node_destroy (priv->current);
priv->current = NULL;
if (!todeactivate) {
GST_DEBUG_OBJECT (comp, "Nothing to deactivate");
return;
}
GST_DEBUG_OBJECT (comp, "De-activating objects no longer used");
/* state-lock elements no more used */
for (tmp = todeactivate; tmp; tmp = tmp->next) {
element = GST_ELEMENT_CAST (tmp->data);
gst_element_set_state (element, priv->deactivated_elements_state);
gst_element_set_locked_state (element, TRUE);
}
g_list_free (todeactivate);
GST_DEBUG_OBJECT (comp, "Finished de-activating objects no longer used");
}
static inline gboolean
_activate_new_stack (GnlComposition * comp, gboolean forcing_flush)
{
GstEvent *event;
GstPad *pad;
GstElement *topelement;
GnlCompositionEntry *topentry;
@ -2813,9 +2696,6 @@ _activate_new_stack (GnlComposition * comp, gboolean forcing_flush)
priv->stackvalid = TRUE;
/* Create new seek event for newly configured timeline stack */
event = get_new_seek_event (comp, forcing_flush, FALSE);
/* The stack is entirely ready, send seek out synchronously */
topelement = GST_ELEMENT (priv->current->data);
/* Get toplevel object source pad */
@ -2825,27 +2705,7 @@ _activate_new_stack (GnlComposition * comp, gboolean forcing_flush)
GST_ERROR_OBJECT (comp,
"We have a valid toplevel element pad %s:%s", GST_DEBUG_PAD_NAME (pad));
/* Send seek event */
GST_ERROR_OBJECT (comp, "sending seek event");
if (gst_pad_send_event (pad, event)) {
/* Unconditionnaly set the ghostpad target to pad */
GST_LOG_OBJECT (comp,
"Setting the composition's ghostpad target to %s:%s",
GST_DEBUG_PAD_NAME (pad));
gnl_composition_ghost_pad_set_target (comp, pad, topentry);
if (topentry->probeid) {
/* unblock top-level pad */
GST_LOG_OBJECT (comp, "About to unblock top-level srcpad");
gst_pad_remove_probe (pad, topentry->probeid);
topentry->probeid = 0;
}
} else {
GST_WARNING_OBJECT (comp, "Could not send seek event to the newly"
"activated stack");
return FALSE;
}
gnl_composition_ghost_pad_set_target (comp, pad, topentry);
GST_ERROR_OBJECT (comp, "New stack activated!");
return TRUE;
@ -2873,7 +2733,6 @@ update_pipeline (GnlComposition * comp, GstClockTime currenttime,
gboolean startchanged, stopchanged;
GNode *stack = NULL;
GList *todeactivate = NULL;
gboolean samestack = FALSE;
gboolean forcing_flush = initial;
GstState state = GST_STATE (comp);
@ -2907,10 +2766,6 @@ update_pipeline (GnlComposition * comp, GstClockTime currenttime,
/* invalidate the stack while modifying it */
priv->stackvalid = FALSE;
/* If stacks are different, unlink/relink objects */
if (!samestack)
todeactivate = compare_relink_stack (comp, stack, modify);
if (priv->segment->rate >= 0.0) {
startchanged = priv->segment_start != currenttime;
stopchanged = priv->segment_stop != new_stop;
@ -2929,7 +2784,9 @@ update_pipeline (GnlComposition * comp, GstClockTime currenttime,
priv->segment_stop = currenttime;
}
_deactivate_current_stack (comp, todeactivate);
/* If stacks are different, unlink/relink objects */
if (!samestack)
compare_relink_stack (comp, stack, modify);
/* Unlock all elements in new stack */
GST_DEBUG_OBJECT (comp, "Setting current stack");
@ -2949,30 +2806,44 @@ update_pipeline (GnlComposition * comp, GstClockTime currenttime,
forcing_flush = (state == GST_STATE_PLAYING) ? FALSE : TRUE;
}
return _activate_new_stack (comp, forcing_flush);
_activate_new_stack (comp, forcing_flush);
return TRUE;
}
static gboolean
gnl_composition_add_object (GstBin * bin, GstElement * element)
{
gboolean ret;
GnlCompositionEntry *entry;
GnlComposition *comp = (GnlComposition *) bin;
if (element == comp->priv->current_bin) {
GST_ERROR_OBJECT (comp, "Adding internal bin");
return GST_BIN_CLASS (parent_class)->add_element (bin, element);
}
g_assert_not_reached ();
return FALSE;
}
static gboolean
_gnl_composition_add_entry (GnlComposition * comp, GnlObject * object)
{
gboolean ret = TRUE;
GnlCompositionEntry *entry;
GnlCompositionPrivate *priv = comp->priv;
/* we only accept GnlObject */
g_return_val_if_fail (GNL_IS_OBJECT (element), FALSE);
g_return_val_if_fail (priv->external_gst_bin_add_remove == FALSE, FALSE);
GST_DEBUG_OBJECT (bin, "element %s", GST_OBJECT_NAME (element));
GST_DEBUG_OBJECT (element, "%" GST_TIME_FORMAT "--%" GST_TIME_FORMAT,
GST_TIME_ARGS (GNL_OBJECT_START (element)),
GST_TIME_ARGS (GNL_OBJECT_STOP (element)));
GST_DEBUG_OBJECT (comp, "element %s", GST_OBJECT_NAME (object));
GST_DEBUG_OBJECT (object, "%" GST_TIME_FORMAT "--%" GST_TIME_FORMAT,
GST_TIME_ARGS (GNL_OBJECT_START (object)),
GST_TIME_ARGS (GNL_OBJECT_STOP (object)));
gst_object_ref (element);
gst_object_ref (object);
if ((GNL_OBJECT_IS_EXPANDABLE (element)) &&
g_list_find (priv->expandables, element)) {
if ((GNL_OBJECT_IS_EXPANDABLE (object)) &&
g_list_find (priv->expandables, object)) {
GST_WARNING_OBJECT (comp,
"We already have an expandable, remove it before adding new one");
ret = FALSE;
@ -2980,55 +2851,52 @@ gnl_composition_add_object (GstBin * bin, GstElement * element)
goto chiringuito;
}
/* Call parent class ::add_element() */
ret = GST_BIN_CLASS (parent_class)->add_element (bin, element);
gnl_object_set_commit_needed (GNL_OBJECT (comp));
if (!ret) {
GST_WARNING_OBJECT (bin, "couldn't add element");
GST_WARNING_OBJECT (comp, "couldn't add object");
goto chiringuito;
}
/* lock state of child ! */
GST_LOG_OBJECT (bin, "Locking state of %s", GST_ELEMENT_NAME (element));
gst_element_set_locked_state (element, TRUE);
GST_LOG_OBJECT (comp, "Locking state of %s", GST_ELEMENT_NAME (object));
gst_element_set_locked_state (GST_ELEMENT (object), TRUE);
/* wrap new element in a GnlCompositionEntry ... */
entry = g_slice_new0 (GnlCompositionEntry);
entry->object = (GnlObject *) element;
entry->object = (GnlObject *) object;
entry->comp = comp;
if (GNL_OBJECT_IS_EXPANDABLE (element)) {
if (GNL_OBJECT_IS_EXPANDABLE (object)) {
/* Only react on non-default objects properties */
g_object_set (element,
g_object_set (object,
"start", (GstClockTime) 0,
"inpoint", (GstClockTime) 0,
"duration", (GstClockTimeDiff) GNL_OBJECT_STOP (comp), NULL);
GST_INFO_OBJECT (element, "Used as expandable, commiting now");
gnl_object_commit (GNL_OBJECT (element), FALSE);
GST_INFO_OBJECT (object, "Used as expandable, commiting now");
gnl_object_commit (GNL_OBJECT (object), FALSE);
}
/* ...and add it to the hash table */
g_hash_table_insert (priv->objects_hash, element, entry);
g_hash_table_insert (priv->objects_hash, object, entry);
_entry_block_and_drop_data (entry);
/* Set the caps of the composition */
if (G_UNLIKELY (!gst_caps_is_any (((GnlObject *) comp)->caps)))
gnl_object_set_caps ((GnlObject *) element, ((GnlObject *) comp)->caps);
gnl_object_set_caps ((GnlObject *) object, ((GnlObject *) comp)->caps);
/* Special case for default source. */
if (GNL_OBJECT_IS_EXPANDABLE (element)) {
if (GNL_OBJECT_IS_EXPANDABLE (object)) {
/* It doesn't get added to objects_start and objects_stop. */
priv->expandables = g_list_prepend (priv->expandables, element);
priv->expandables = g_list_prepend (priv->expandables, object);
goto beach;
}
/* add it sorted to the objects list */
priv->objects_start = g_list_insert_sorted
(priv->objects_start, element, (GCompareFunc) objects_start_compare);
(priv->objects_start, object, (GCompareFunc) objects_start_compare);
if (priv->objects_start)
GST_LOG_OBJECT (comp,
@ -3039,12 +2907,11 @@ gnl_composition_add_object (GstBin * bin, GstElement * element)
GST_TIME_ARGS (GNL_OBJECT_STOP (priv->objects_start->data)));
priv->objects_stop = g_list_insert_sorted
(priv->objects_stop, element, (GCompareFunc) objects_stop_compare);
(priv->objects_stop, object, (GCompareFunc) objects_stop_compare);
/* Now the object is ready to be commited and then used */
beach:
gst_object_unref (element);
return ret;
chiringuito:
@ -3058,46 +2925,55 @@ static gboolean
gnl_composition_remove_object (GstBin * bin, GstElement * element)
{
GnlComposition *comp = (GnlComposition *) bin;
GnlCompositionPrivate *priv = comp->priv;
if (element == comp->priv->current_bin) {
GST_ERROR_OBJECT (comp, "Adding internal bin");
return GST_BIN_CLASS (parent_class)->remove_element (bin, element);
}
g_assert_not_reached ();
return FALSE;
}
static gboolean
_gnl_composition_remove_entry (GnlComposition * comp, GnlObject * object)
{
gboolean ret = FALSE;
GnlCompositionEntry *entry;
GnlCompositionPrivate *priv = comp->priv;
GST_DEBUG_OBJECT (bin, "element %s", GST_OBJECT_NAME (element));
GST_ERROR_OBJECT (comp, "object %s", GST_OBJECT_NAME (object));
/* we only accept GnlObject */
g_return_val_if_fail (GNL_IS_OBJECT (element), FALSE);
g_return_val_if_fail (priv->external_gst_bin_add_remove == FALSE, FALSE);
entry = COMP_ENTRY (comp, element);
entry = COMP_ENTRY (comp, object);
if (entry == NULL) {
goto out;
}
gst_object_ref (element);
gst_element_set_locked_state (element, FALSE);
gst_element_set_locked_state (GST_ELEMENT (object), FALSE);
/* handle default source */
if (GNL_OBJECT_IS_EXPANDABLE (element)) {
if (GNL_OBJECT_IS_EXPANDABLE (object)) {
/* Find it in the list */
priv->expandables = g_list_remove (priv->expandables, element);
priv->expandables = g_list_remove (priv->expandables, object);
} else {
/* remove it from the objects list and resort the lists */
priv->objects_start = g_list_remove (priv->objects_start, element);
priv->objects_stop = g_list_remove (priv->objects_stop, element);
GST_LOG_OBJECT (element, "Removed from the objects start/stop list");
priv->objects_start = g_list_remove (priv->objects_start, object);
priv->objects_stop = g_list_remove (priv->objects_stop, object);
GST_LOG_OBJECT (object, "Removed from the objects start/stop list");
}
if (priv->current && GNL_OBJECT (priv->current->data) == GNL_OBJECT (element))
if (priv->current && GNL_OBJECT (priv->current->data) == GNL_OBJECT (object))
gnl_composition_reset_target_pad (comp);
g_hash_table_remove (priv->objects_hash, element);
g_hash_table_remove (priv->objects_hash, object);
ret = GST_BIN_CLASS (parent_class)->remove_element (bin, element);
GST_LOG_OBJECT (element, "Done removing from the composition, now updating");
GST_LOG_OBJECT (object, "Done removing from the composition, now updating");
/* Make it possible to reuse the same object later */
gnl_object_reset (GNL_OBJECT (element));
gst_object_unref (element);
gnl_object_reset (GNL_OBJECT (object));
gst_object_unref (object);
out:
return ret;

7
gnl/gnlghostpad.c
View file

@ -39,8 +39,8 @@ struct _GnlPadPrivate
GstEvent *pending_seek;
};
static GstEvent *
translate_incoming_seek (GnlObject * object, GstEvent * event)
GstEvent *
gnl_object_translate_incoming_seek (GnlObject * object, GstEvent * event)
{
GstEvent *event2;
GstFormat format;
@ -494,7 +494,8 @@ ghostpad_event_function (GstPad * ghostpad, GstObject * parent,
{
GstPad *target;
event = translate_incoming_seek (object, event);
GST_ERROR_OBJECT (object, "GOT SEEKD: %" GST_PTR_FORMAT, event);
event = gnl_object_translate_incoming_seek (object, event);
if (!(target = gst_ghost_pad_get_target (GST_GHOST_PAD (ghostpad)))) {
priv->pending_seek = event;
GST_INFO_OBJECT (ghostpad, "No target set yet, "

1
gnl/gnlghostpad.h
View file

@ -39,6 +39,7 @@ gboolean gnl_object_ghost_pad_set_target (GnlObject * object,
GstPad * ghost, GstPad * target);
void gnl_object_remove_ghost_pad (GnlObject * object, GstPad * ghost);
GstEvent * gnl_object_translate_incoming_seek (GnlObject * object, GstEvent * event);
void gnl_init_ghostpad_category (void);

1
gnl/gnlobject.c
View file

@ -684,5 +684,4 @@ gnl_object_get_type (void)
g_once_init_leave (&type, _type);
}
return type;
}

10
gnl/gnlsource.c
View file

@ -302,22 +302,22 @@ ghost_seek_pad (GnlSource * source)
GST_DEBUG_OBJECT (source, "ghosting %s:%s", GST_DEBUG_PAD_NAME (pad));
gnl_object_ghost_pad_set_target (gnlobject, gnlobject->srcpad, pad);
GST_DEBUG_OBJECT (source, "emitting no more pads");
/*FIXME : do that when going to PAUSED */
gst_pad_set_active (gnlobject->srcpad, TRUE);
if (priv->event) {
GST_DEBUG_OBJECT (source, "sending queued seek event");
GST_DEBUG_OBJECT (source, "about to unblock %s:%s", GST_DEBUG_PAD_NAME (pad));
/* FIXME: Kill that code please! */
if (g_strcmp0 (GST_OBJECT_NAME (GST_OBJECT_PARENT (source)), "current-bin")
&& priv->event) {
if (!(gst_pad_send_event (gnlobject->srcpad, priv->event)))
GST_ELEMENT_ERROR (source, RESOURCE, SEEK,
(NULL), ("Sending initial seek to upstream element failed"));
else
GST_DEBUG_OBJECT (source, "queued seek sent");
GST_ERROR_OBJECT (source, "queued seek sent");
priv->event = NULL;
}
GST_DEBUG_OBJECT (source, "about to unblock %s:%s", GST_DEBUG_PAD_NAME (pad));
priv->is_blocked = FALSE;
if (priv->probeid) {
gst_pad_remove_probe (pad, priv->probeid);

30
tests/check/gnl/complex.c
View file

@ -185,17 +185,17 @@ GST_START_TEST (test_one_space_another)
/* Add one source */
gnl_composition_add (GST_BIN (comp), source1);
GST_ERROR ("doing one commit");
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 1 * GST_SECOND, 1 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
/* Second source */
gnl_composition_add (GST_BIN (comp), source2);
check_start_stop_duration (comp, 0, 1 * GST_SECOND, 1 * GST_SECOND);
g_signal_emit_by_name (comp, "commit", TRUE, &ret);
commit_and_wait (comp, &ret);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 1);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 2);
/* Remove first source */
@ -211,7 +211,7 @@ GST_START_TEST (test_one_space_another)
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 3 * GST_SECOND, 3 * GST_SECOND);
gst_object_unref (source1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
/* Expected segments */
segments = g_list_append (segments,
@ -294,7 +294,7 @@ GST_START_TEST (test_one_default_another)
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, GST_SECOND, 2 * GST_SECOND, 1 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
/* defaultsrc source */
gnl_composition_add (GST_BIN (comp), defaultsrc);
@ -302,7 +302,7 @@ GST_START_TEST (test_one_default_another)
check_start_stop_duration (comp, 0, 2 * GST_SECOND, 2 * GST_SECOND);
check_start_stop_duration (defaultsrc, 0, 2 * GST_SECOND, 2 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (defaultsrc, "defaultsrc", 1);
ASSERT_OBJECT_REFCOUNT (defaultsrc, "defaultsrc", 2);
/* Second source */
@ -315,7 +315,7 @@ GST_START_TEST (test_one_default_another)
check_start_stop_duration (comp, 0, 5 * GST_SECOND, 5 * GST_SECOND);
check_start_stop_duration (defaultsrc, 0, 5 * GST_SECOND, 5 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source3, "source3", 1);
ASSERT_OBJECT_REFCOUNT (source3, "source3", 2);
/* Expected segments */
segments = g_list_append (segments,
@ -408,7 +408,7 @@ GST_START_TEST (test_one_expandable_another)
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, GST_SECOND, 2 * GST_SECOND, 1 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
/* defaultsrc source */
@ -417,7 +417,7 @@ GST_START_TEST (test_one_expandable_another)
check_start_stop_duration (comp, 0, 2 * GST_SECOND, 2 * GST_SECOND);
check_start_stop_duration (defaultsrc, 0, 2 * GST_SECOND, 2 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (defaultsrc, "defaultsrc", 1);
ASSERT_OBJECT_REFCOUNT (defaultsrc, "defaultsrc", 2);
/* Second source */
@ -426,7 +426,7 @@ GST_START_TEST (test_one_expandable_another)
check_start_stop_duration (comp, 0, 4 * GST_SECOND, 4 * GST_SECOND);
check_start_stop_duration (defaultsrc, 0, 4 * GST_SECOND, 4 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 1);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 2);
/* Third source */
@ -436,7 +436,7 @@ GST_START_TEST (test_one_expandable_another)
check_start_stop_duration (comp, 0, 5 * GST_SECOND, 5 * GST_SECOND);
check_start_stop_duration (defaultsrc, 0, 5 * GST_SECOND, 5 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source3, "source3", 1);
ASSERT_OBJECT_REFCOUNT (source3, "source3", 2);
/* Expected segments */
segments = g_list_append (segments,
@ -518,7 +518,7 @@ GST_START_TEST (test_renegotiation)
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 1 * GST_SECOND, 1 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
/* Second source */
@ -526,7 +526,7 @@ GST_START_TEST (test_renegotiation)
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 2 * GST_SECOND, 2 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 1);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 2);
/* Third source */
@ -535,7 +535,7 @@ GST_START_TEST (test_renegotiation)
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 3 * GST_SECOND, 3 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source3, "source3", 1);
ASSERT_OBJECT_REFCOUNT (source3, "source3", 2);
sink = gst_element_factory_make_or_warn ("fakesink", "sink");
@ -570,7 +570,7 @@ GST_START_TEST (test_renegotiation)
bus = gst_element_get_bus (GST_ELEMENT (pipeline));
GST_DEBUG ("Setting pipeline to PLAYING");
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
fail_if (gst_element_set_state (GST_ELEMENT (pipeline),
GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE);

2
tests/check/gnl/gnlcomposition.c
View file

@ -94,7 +94,7 @@ GST_START_TEST (test_change_object_start_stop_in_current_stack)
bus = gst_element_get_bus (GST_ELEMENT (pipeline));
GST_DEBUG ("Setting pipeline to PLAYING");
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 3);
fail_if (gst_element_set_state (GST_ELEMENT (pipeline),
GST_STATE_PAUSED) == GST_STATE_CHANGE_FAILURE);

20
tests/check/gnl/gnloperation.c
View file

@ -169,7 +169,7 @@ GST_START_TEST (test_simple_operation)
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 3 * GST_SECOND, 3 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source, "source", 1);
ASSERT_OBJECT_REFCOUNT (source, "source", 2);
/* Add operaton */
@ -177,7 +177,7 @@ GST_START_TEST (test_simple_operation)
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 3 * GST_SECOND, 3 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (oper, "oper", 1);
ASSERT_OBJECT_REFCOUNT (oper, "oper", 2);
/* remove source */
@ -194,7 +194,7 @@ GST_START_TEST (test_simple_operation)
check_start_stop_duration (comp, 0, 3 * GST_SECOND, 3 * GST_SECOND);
gst_object_unref (source);
ASSERT_OBJECT_REFCOUNT (source, "source", 1);
ASSERT_OBJECT_REFCOUNT (source, "source", 2);
/* Expected segments */
segments = g_list_append (segments,
@ -259,7 +259,7 @@ GST_START_TEST (test_pyramid_operations)
check_start_stop_duration (source, 0, 10 * GST_SECOND, 10 * GST_SECOND);
check_start_stop_duration (comp, 0, 10 * GST_SECOND, 10 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source, "source", 1);
ASSERT_OBJECT_REFCOUNT (source, "source", 2);
/* Add operation 1 */
@ -269,7 +269,7 @@ GST_START_TEST (test_pyramid_operations)
2 * GST_SECOND);
check_start_stop_duration (comp, 0, 10 * GST_SECOND, 10 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (oper1, "oper1", 1);
ASSERT_OBJECT_REFCOUNT (oper1, "oper1", 2);
/* Add operation 2 */
@ -279,7 +279,7 @@ GST_START_TEST (test_pyramid_operations)
6 * GST_SECOND);
check_start_stop_duration (comp, 0, 10 * GST_SECOND, 10 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (oper1, "oper2", 1);
ASSERT_OBJECT_REFCOUNT (oper1, "oper2", 2);
/* Expected segments */
segments = g_list_append (segments,
@ -554,7 +554,7 @@ GST_START_TEST (test_complex_operations)
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 6 * GST_SECOND, 6 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (oper, "oper", 1);
ASSERT_OBJECT_REFCOUNT (oper, "oper", 2);
/* Expected segments */
segments = g_list_append (segments,
@ -635,14 +635,14 @@ GST_START_TEST (test_complex_operations_bis)
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 4 * GST_SECOND, 4 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
/* Add source2 */
gnl_composition_add (GST_BIN (comp), source2);
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 6 * GST_SECOND, 6 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 1);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 2);
/* Add operaton */
@ -653,7 +653,7 @@ GST_START_TEST (test_complex_operations_bis)
check_start_stop_duration (oper, 0 * GST_SECOND, 6 * GST_SECOND,
6 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (oper, "oper", 1);
ASSERT_OBJECT_REFCOUNT (oper, "oper", 2);
/* Expected segments */
segments = g_list_append (segments,

23
tests/check/gnl/seek.c
View file

@ -188,7 +188,7 @@ test_simplest_full (void)
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 1 * GST_SECOND, 1 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
/* Expected segments */
segments = g_list_append (segments,
@ -276,8 +276,8 @@ test_one_after_other_full (void)
1 * GST_SECOND);
check_start_stop_duration (comp, 0, 2 * GST_SECOND, 2 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 2);
/* Expected segments */
@ -424,8 +424,6 @@ test_one_bin_after_other_full (void)
gnl_composition_add (GST_BIN (comp), source1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
/* Second source */
gnl_composition_add (GST_BIN (comp), source2);
@ -435,7 +433,8 @@ test_one_bin_after_other_full (void)
1 * GST_SECOND);
check_start_stop_duration (comp, 0, 2 * GST_SECOND, 2 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 2);
/* Expected segments */
segments = g_list_append (segments,
@ -536,14 +535,14 @@ GST_START_TEST (test_complex_operations)
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 4 * GST_SECOND, 4 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
/* Add source2 */
gnl_composition_add (GST_BIN (comp), source2);
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 6 * GST_SECOND, 6 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 1);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 2);
/* Add operaton */
@ -551,7 +550,7 @@ GST_START_TEST (test_complex_operations)
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 6 * GST_SECOND, 6 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (oper, "oper", 1);
ASSERT_OBJECT_REFCOUNT (oper, "oper", 2);
/* Expected segments */
segments = g_list_append (segments,
@ -656,14 +655,14 @@ GST_START_TEST (test_complex_operations_bis)
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 4 * GST_SECOND, 4 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
/* Add source2 */
gnl_composition_add (GST_BIN (comp), source2);
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 6 * GST_SECOND, 6 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 1);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 2);
/* Add operaton */
@ -676,7 +675,7 @@ GST_START_TEST (test_complex_operations_bis)
check_start_stop_duration (oper, 0 * GST_SECOND, 6 * GST_SECOND,
6 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (oper, "oper", 1);
ASSERT_OBJECT_REFCOUNT (oper, "oper", 2);
/* Expected segments */
segments = g_list_append (segments,

28
tests/check/gnl/simple.c
View file

@ -36,7 +36,7 @@ test_simplest_full (void)
fail_unless (ret);
check_start_stop_duration (source1, 0, 1 * GST_SECOND, 1 * GST_SECOND);
check_start_stop_duration (comp, 0, 1 * GST_SECOND, 1 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
sink = gst_element_factory_make_or_warn ("fakesink", "sink");
fail_if (sink == NULL);
@ -60,7 +60,7 @@ test_simplest_full (void)
bus = gst_element_get_bus (GST_ELEMENT (pipeline));
GST_ERROR ("Setting pipeline to PLAYING");
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
fail_if (gst_element_set_state (GST_ELEMENT (pipeline),
GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE);
@ -147,7 +147,7 @@ test_time_duration_full (void)
fail_unless (ret == TRUE);
check_start_stop_duration (comp, 0, 1 * GST_SECOND, 1 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
/* Second source */
@ -157,13 +157,15 @@ test_time_duration_full (void)
fail_unless (ret == TRUE);
check_start_stop_duration (comp, 0, 2 * GST_SECOND, 2 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 1);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 2);
/* Remove first source */
gst_object_ref (source1);
GST_ERROR_OBJECT (source1, "Num refs : %i", ((GObject *) source1)->ref_count);
gnl_composition_remove (GST_BIN (comp), source1);
commit_and_wait (comp, &ret);
GST_ERROR_OBJECT (source1, "Num refs : %i", ((GObject *) source1)->ref_count);
check_start_stop_duration (comp, 1 * GST_SECOND, 2 * GST_SECOND,
1 * GST_SECOND);
@ -176,7 +178,7 @@ test_time_duration_full (void)
check_start_stop_duration (comp, 0, 2 * GST_SECOND, 2 * GST_SECOND);
gst_object_unref (source1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
gst_object_unref (comp);
}
@ -230,7 +232,7 @@ test_one_after_other_full (void)
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 1 * GST_SECOND, 1 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
/* Second source */
gnl_composition_add (GST_BIN (comp), source2);
@ -243,7 +245,7 @@ test_one_after_other_full (void)
1 * GST_SECOND);
check_start_stop_duration (comp, 0, 2 * GST_SECOND, 2 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 1);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 2);
/* Remove first source */
@ -261,7 +263,7 @@ test_one_after_other_full (void)
check_start_stop_duration (comp, 0, 2 * GST_SECOND, 2 * GST_SECOND);
gst_object_unref (source1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
sink = gst_element_factory_make_or_warn ("fakesink", "sink");
fail_if (sink == NULL);
@ -289,7 +291,7 @@ test_one_after_other_full (void)
bus = gst_element_get_bus (GST_ELEMENT (pipeline));
GST_DEBUG ("Setting pipeline to PLAYING");
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
fail_if (gst_element_set_state (GST_ELEMENT (pipeline),
GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE);
@ -582,7 +584,7 @@ test_one_bin_after_other_full (void)
check_start_stop_duration (comp, 0, 1 * GST_SECOND, 1 * GST_SECOND);
check_start_stop_duration (source1, 0, 1 * GST_SECOND, 1 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
/* Second source */
@ -593,7 +595,7 @@ test_one_bin_after_other_full (void)
check_start_stop_duration (source2, 1 * GST_SECOND, 2 * GST_SECOND,
1 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 1);
ASSERT_OBJECT_REFCOUNT (source2, "source2", 2);
/* Remove first source */
@ -611,7 +613,7 @@ test_one_bin_after_other_full (void)
check_start_stop_duration (comp, 0, 2 * GST_SECOND, 2 * GST_SECOND);
gst_object_unref (source1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
sink = gst_element_factory_make_or_warn ("fakesink", "sink");
fail_if (sink == NULL);
@ -639,7 +641,7 @@ test_one_bin_after_other_full (void)
bus = gst_element_get_bus (GST_ELEMENT (pipeline));
GST_DEBUG ("Setting pipeline to PLAYING");
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
fail_if (gst_element_set_state (GST_ELEMENT (pipeline),
GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE);