Title: [273731] trunk/Source/WebCore
Revision
273731
Author
[email protected]
Date
2021-03-02 08:31:54 -0800 (Tue, 02 Mar 2021)

Log Message

[GStreamer] Error instead of asserting on the player in the source
https://bugs.webkit.org/show_bug.cgi?id=222108

Reviewed by Philippe Normand.

The release assert can be hit in some cases in smoothstreaming
with already invalid pipelines so better to just error out instead
of assert on release.

* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcCreate):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (273730 => 273731)


--- trunk/Source/WebCore/ChangeLog	2021-03-02 15:37:23 UTC (rev 273730)
+++ trunk/Source/WebCore/ChangeLog	2021-03-02 16:31:54 UTC (rev 273731)
@@ -1,3 +1,17 @@
+2021-03-02  Xabier Rodriguez Calvar  <[email protected]>
+
+        [GStreamer] Error instead of asserting on the player in the source
+        https://bugs.webkit.org/show_bug.cgi?id=222108
+
+        Reviewed by Philippe Normand.
+
+        The release assert can be hit in some cases in smoothstreaming
+        with already invalid pipelines so better to just error out instead
+        of assert on release.
+
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (webKitWebSrcCreate):
+
 2021-03-02  Youenn Fablet  <[email protected]>
 
         Enable MEDIA_SOURCE in IOS Simulator

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (273730 => 273731)


--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2021-03-02 15:37:23 UTC (rev 273730)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2021-03-02 16:31:54 UTC (rev 273731)
@@ -480,7 +480,10 @@
         if (members->isFlushing)
             return GST_FLOW_FLUSHING;
     }
-    RELEASE_ASSERT(members->player);
+    if (!members->player) {
+        GST_ERROR_OBJECT(src, "Couldn't obtain WebKitWebSrcPlayerContext, which is necessary to make network requests");
+        return GST_FLOW_ERROR;
+    }
 
     GST_TRACE_OBJECT(src, "readPosition = %" G_GUINT64_FORMAT " requestedPosition = %" G_GUINT64_FORMAT, members->readPosition, members->requestedPosition);
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to