Skip to content
Snippets Groups Projects
Commit 582bf15c authored by Sebastian Dröge's avatar Sebastian Dröge :tea:
Browse files

Revert "nleobject: Start up in NULL->READY->PAUSED after the parent class did"

This reverts commit 5f7943c5.
parent 5f7943c5
No related branches found
No related tags found
No related merge requests found
...@@ -630,21 +630,7 @@ nle_object_change_state (GstElement * element, GstStateChange transition) ...@@ -630,21 +630,7 @@ nle_object_change_state (GstElement * element, GstStateChange transition)
{ {
GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS; GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
GST_DEBUG_OBJECT (element, "Calling parent change_state");
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
GST_DEBUG_OBJECT (element, "Return from parent change_state was %d", ret);
if (ret == GST_STATE_CHANGE_FAILURE)
goto beach;
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY:
/* cleanup nleobject */
if (nle_object_cleanup (NLE_OBJECT (element)) == GST_STATE_CHANGE_FAILURE)
ret = GST_STATE_CHANGE_FAILURE;
break;
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
{ {
GstObject *parent = gst_object_get_parent (GST_OBJECT (element)); GstObject *parent = gst_object_get_parent (GST_OBJECT (element));
...@@ -673,6 +659,25 @@ nle_object_change_state (GstElement * element, GstStateChange transition) ...@@ -673,6 +659,25 @@ nle_object_change_state (GstElement * element, GstStateChange transition)
break; break;
} }
GST_DEBUG_OBJECT (element, "Calling parent change_state");
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
GST_DEBUG_OBJECT (element, "Return from parent change_state was %d", ret);
if (ret == GST_STATE_CHANGE_FAILURE)
goto beach;
switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY:
/* cleanup nleobject */
if (nle_object_cleanup (NLE_OBJECT (element)) == GST_STATE_CHANGE_FAILURE)
ret = GST_STATE_CHANGE_FAILURE;
break;
default:
break;
}
beach: beach:
return ret; return ret;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment