decodebin/playbin/playsink/subtitleoverlay: Post async-done on state change failures

https://bugzilla.gnome.org/show_bug.cgi?id=756611

diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index 71336b01139667ed8b54a59e605e1cf3481235f7..cf3a2d1175ff5a2a324c1151a66600e3c3c3736e 100644 (file)
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -5190,6 +5190,7 @@ activate_failed:
   {
     GST_DEBUG_OBJECT (element,
         "element failed to change states -- activation problem?");
+    do_async_done (dbin);
     return GST_STATE_CHANGE_FAILURE;
   }
 }

diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index b4e90fcf4a782227981b1573b8a72ecffcb5e778..0fde6c2f8d4de5342835c9f24ac774aff25a1b4a 100644 (file)
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -5779,6 +5779,8 @@ gst_play_bin_change_state (GstElement * element, GstStateChange transition)
   /* ERRORS */
 failure:
   {
+    do_async_done (playbin);
+
     if (transition == GST_STATE_CHANGE_READY_TO_PAUSED) {
       GstSourceGroup *curr_group;
 

diff --git a/gst/playback/gstplaysink.c b/gst/playback/gstplaysink.c
index 6c5a2cfeb17d5f391bb66678f8c1a192d15be3a8..1685692d9eef1875ff380fb8a5d320abe63ce5c9 100644 (file)
--- a/gst/playback/gstplaysink.c
+++ b/gst/playback/gstplaysink.c
@@ -4961,6 +4961,7 @@ activate_failed:
   {
     GST_DEBUG_OBJECT (element,
         "element failed to change states -- activation problem?");
+    do_async_done (playsink);
     return GST_STATE_CHANGE_FAILURE;
   }
 }

diff --git a/gst/playback/gstsubtitleoverlay.c b/gst/playback/gstsubtitleoverlay.c
index 3f24fd5df0ebf78aaa6f1e07203cb8e286e3988e..719eebb507df45039afa2117779878956c3d4f28 100644 (file)
--- a/gst/playback/gstsubtitleoverlay.c
+++ b/gst/playback/gstsubtitleoverlay.c
@@ -1333,8 +1333,11 @@ gst_subtitle_overlay_change_state (GstElement * element,
 
     bret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
     GST_DEBUG_OBJECT (self, "Base class state changed returned: %d", bret);
-    if (G_UNLIKELY (bret == GST_STATE_CHANGE_FAILURE))
+    if (G_UNLIKELY (bret == GST_STATE_CHANGE_FAILURE)) {
+      do_async_done (self);
       return ret;
+    }
+
     else if (bret == GST_STATE_CHANGE_ASYNC)
       ret = bret;
     else if (G_UNLIKELY (bret == GST_STATE_CHANGE_NO_PREROLL)) {