Commit e903f153 authored by Thibault Saunier's avatar Thibault Saunier 🌵

nlecomposition: Shutdown children when setting state to NULL

Otherwise if we shutdown a composition whith an nested composition
(inside a source in the test) and leak it, we end up with the nested
composition task still running (in READY) which is bad.

Add a test for that which leaks the pipeline on purpose.
parent 351182ba
......@@ -2501,6 +2501,16 @@ _update_pipeline_func (NleComposition * comp, UpdateCompositionData * ucompo)
_post_start_composition_update_done (comp, ucompo->seqnum, ucompo->reason);
}
/* Never call when ->task runs! */
static void
_set_all_children_state (NleComposition * comp, GstState state)
{
GList *tmp;
for (tmp = comp->priv->objects_start; tmp; tmp = tmp->next)
gst_element_set_state (tmp->data, state);
}
static GstStateChangeReturn
nle_composition_change_state (GstElement * element, GstStateChange transition)
{
......@@ -2513,6 +2523,7 @@ nle_composition_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
_set_all_children_state (comp, GST_STATE_READY);
_start_task (comp);
break;
case GST_STATE_CHANGE_READY_TO_PAUSED:
......@@ -2536,6 +2547,7 @@ nle_composition_change_state (GstElement * element, GstStateChange transition)
_remove_update_actions (comp);
_remove_seek_actions (comp);
_set_all_children_state (comp, GST_STATE_NULL);
comp->priv->tearing_down_stack = TRUE;
break;
default:
......
......@@ -438,12 +438,29 @@ GST_START_TEST (test_simple_audiomixer)
GST_END_TEST;
static GstElement *
create_nested_source ()
{
GstElement *source, *nested_source, *nested_comp;
source = videotest_nle_src ("source", 0, 2 * GST_SECOND, 2, 2);
nested_comp =
gst_element_factory_make_or_warn ("nlecomposition", "nested_comp");
nle_composition_add (GST_BIN (nested_comp), source);
nested_source =
gst_element_factory_make_or_warn ("nlesource", "nested_source");
g_object_set (nested_source, "start", 0, "duration", 2 * GST_SECOND, NULL);
gst_bin_add (GST_BIN (nested_source), nested_comp);
return nested_source;
}
GST_START_TEST (test_seek_on_nested)
{
GstPad *srcpad;
GstElement *pipeline;
GstElement *comp, *source, *nested_source, *nested_comp, *sink;
GstBus *bus;
GstPad *srcpad;
GstElement *pipeline, *comp, *nested_source, *sink;
GstMessage *message;
gboolean carry_on, ret = FALSE;
GstClockTime position;
......@@ -451,32 +468,15 @@ GST_START_TEST (test_seek_on_nested)
ges_init ();
pipeline = gst_pipeline_new ("test_pipeline");
comp =
gst_element_factory_make_or_warn ("nlecomposition", "test_composition");
comp = gst_element_factory_make_or_warn ("nlecomposition", NULL);
gst_element_set_state (comp, GST_STATE_READY);
sink = gst_element_factory_make_or_warn ("fakesink", "sink");
gst_bin_add_many (GST_BIN (pipeline), comp, sink, NULL);
gst_element_link (comp, sink);
/*
source
Start : 0s
Duration : 2s
Priority : 2
*/
source = videotest_nle_src ("source", 0, 2 * GST_SECOND, 2, 2);
nested_comp =
gst_element_factory_make_or_warn ("nlecomposition", "nested_comp");
nle_composition_add (GST_BIN (nested_comp), source);
nested_source =
gst_element_factory_make_or_warn ("nlesource", "nested_source");
gst_bin_add (GST_BIN (nested_source), nested_comp);
g_object_set (nested_source, "start", 0, "duration", 2 * GST_SECOND, NULL);
nested_source = create_nested_source ();
srcpad = gst_element_get_static_pad (nested_source, "src");
gst_pad_add_probe (srcpad, GST_PAD_PROBE_TYPE_EVENT_UPSTREAM,
(GstPadProbeCallback) on_source1_pad_event_cb, NULL, NULL);
......@@ -485,14 +485,10 @@ GST_START_TEST (test_seek_on_nested)
/* Add nested source */
nle_composition_add (GST_BIN (comp), nested_source);
commit_and_wait (comp, &ret);
check_start_stop_duration (source, 0, 2 * GST_SECOND, 2 * GST_SECOND);
check_start_stop_duration (comp, 0, 2 * GST_SECOND, 2 * GST_SECOND);
bus = gst_element_get_bus (GST_ELEMENT (pipeline));
GST_DEBUG ("Setting pipeline to PAUSED");
ASSERT_OBJECT_REFCOUNT (source, "source", 1);
fail_if (gst_element_set_state (GST_ELEMENT (pipeline),
GST_STATE_PAUSED) == GST_STATE_CHANGE_FAILURE);
......@@ -543,12 +539,96 @@ GST_START_TEST (test_seek_on_nested)
fail_if (gst_element_set_state (GST_ELEMENT (pipeline),
GST_STATE_NULL) == GST_STATE_CHANGE_FAILURE);
gst_element_set_state (source, GST_STATE_NULL);
GST_DEBUG ("Resetted pipeline to NULL");
ASSERT_OBJECT_REFCOUNT_BETWEEN (pipeline, "main pipeline", 1, 2);
gst_check_objects_destroyed_on_unref (pipeline, comp, nested_comp, NULL);
gst_check_objects_destroyed_on_unref (pipeline, comp, nested_source, NULL);
ASSERT_OBJECT_REFCOUNT_BETWEEN (bus, "main bus", 1, 2);
gst_object_unref (bus);
ges_deinit ();
}
GST_END_TEST;
GST_START_TEST (test_error_in_nested_timeline)
{
GstBus *bus;
GstPad *srcpad;
GstElement *pipeline, *comp, *nested_source, *sink;
GstMessage *message;
gboolean carry_on, ret = FALSE;
ges_init ();
pipeline = gst_pipeline_new ("test_pipeline");
comp = gst_element_factory_make_or_warn ("nlecomposition", NULL);
gst_element_set_state (comp, GST_STATE_READY);
sink = gst_element_factory_make_or_warn ("fakesink", "sink");
gst_bin_add_many (GST_BIN (pipeline), comp, sink, NULL);
gst_element_link (comp, sink);
nested_source = create_nested_source ();
srcpad = gst_element_get_static_pad (nested_source, "src");
gst_pad_add_probe (srcpad, GST_PAD_PROBE_TYPE_EVENT_UPSTREAM,
(GstPadProbeCallback) on_source1_pad_event_cb, NULL, NULL);
gst_object_unref (srcpad);
/* Add nested source */
nle_composition_add (GST_BIN (comp), nested_source);
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 2 * GST_SECOND, 2 * GST_SECOND);
bus = gst_element_get_bus (GST_ELEMENT (pipeline));
fail_if (gst_element_set_state (GST_ELEMENT (pipeline),
GST_STATE_PAUSED) == GST_STATE_CHANGE_FAILURE);
GST_DEBUG ("Let's poll the bus");
carry_on = TRUE;
while (carry_on) {
message = gst_bus_poll (bus, GST_MESSAGE_ANY, GST_SECOND / 10);
if (message) {
switch (GST_MESSAGE_TYPE (message)) {
case GST_MESSAGE_ASYNC_DONE:
{
carry_on = FALSE;
GST_DEBUG ("Pipeline reached PAUSED, stopping polling");
break;
}
case GST_MESSAGE_EOS:
{
GST_WARNING ("Saw EOS");
fail_if (TRUE);
}
case GST_MESSAGE_ERROR:
GST_DEBUG_BIN_TO_DOT_FILE (GST_BIN (pipeline),
GST_DEBUG_GRAPH_SHOW_ALL, "error");
fail_error_message (message);
default:
break;
}
gst_mini_object_unref (GST_MINI_OBJECT (message));
}
}
GST_ELEMENT_ERROR (nested_source, STREAM, FAILED,
("Faking an error message"), ("Nothing"));
message =
gst_bus_timed_pop_filtered (bus, GST_CLOCK_TIME_NONE, GST_MESSAGE_ERROR);
gst_mini_object_unref (GST_MINI_OBJECT (message));
fail_if (gst_element_set_state (GST_ELEMENT (pipeline),
GST_STATE_NULL) == GST_STATE_CHANGE_FAILURE);
GST_DEBUG ("Resetted pipeline to NULL");
ASSERT_OBJECT_REFCOUNT_BETWEEN (bus, "main bus", 1, 2);
gst_object_unref (bus);
......@@ -570,6 +650,7 @@ gnonlin_suite (void)
tcase_add_test (tc_chain, test_remove_invalid_object);
tcase_add_test (tc_chain, test_remove_last_object);
tcase_add_test (tc_chain, test_seek_on_nested);
tcase_add_test (tc_chain, test_error_in_nested_timeline);
tcase_add_test (tc_chain, test_dispose_on_commit);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment