Merge r247643 - [GStreamer] Flush get_range calls during PAUSED->READ…

…Y in WebKitWebSource https://bugs.webkit.org/show_bug.cgi?id=199934 Reviewed by Xabier Rodriguez-Calvar. Unit testing not applicable. * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: (webKitWebSrcChangeState): A well-behaved element should unblock streaming threads during a PAUSED->READY transition, so do that here.
WebKit · Aug 4, 2019 · e24680b · e24680b
1 parent 9450fdc
commit e24680b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2019-07-19  Charlie Turner  <cturner@igalia.com>
+
+        [GStreamer] Flush get_range calls during PAUSED->READY in WebKitWebSource
+        https://bugs.webkit.org/show_bug.cgi?id=199934
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        Unit testing not applicable.
+
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (webKitWebSrcChangeState): A well-behaved element should unblock streaming threads
+        during a PAUSED->READY transition, so do that here.
+
 2019-07-15  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         [GTK] GitHub breaks on FreeBSD because of "unsupported browser"

diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
@@ -776,7 +776,13 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat
     case GST_STATE_CHANGE_READY_TO_NULL:
         webKitWebSrcCloseSession(src);
         break;
-    default:
+    case GST_STATE_CHANGE_PAUSED_TO_READY: {
+        LockHolder locker(src->priv->responseLock);
+        GST_DEBUG_OBJECT(src, "PAUSED->READY cancelling network requests");
+        src->priv->isFlushing = true;
+        src->priv->responseCondition.notifyOne();
+        break;
+    } default:
         break;
     }