Title: [275028] releases/WebKitGTK/webkit-2.32
- Revision
- 275028
- Author
- [email protected]
- Date
- 2021-03-25 07:07:20 -0700 (Thu, 25 Mar 2021)
Log Message
Merge r274976 - REGRESSION(r274870) fast/canvas/webgl/texImage2D-mse-flipY-true.html and fast/canvas/webgl/texImage2D-mse-flipY-false.html are crashing
https://bugs.webkit.org/show_bug.cgi?id=223674
Patch by Philippe Normand <[email protected]> on 2021-03-24
Reviewed by Kenneth Russell.
Source/WebCore:
When the srcObject is directly set on a media element, the corresponding URL might still be
empty, so we need to ensure the URI corresponding to the MediaSource blob is not empty,
otherwise uridecodebin would fail to create the right source element.
* platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp:
(WebCore::MediaPlayerPrivateGStreamerMSE::load):
LayoutTests:
* platform/glib/TestExpectations:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/LayoutTests/ChangeLog (275027 => 275028)
--- releases/WebKitGTK/webkit-2.32/LayoutTests/ChangeLog 2021-03-25 14:07:14 UTC (rev 275027)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/ChangeLog 2021-03-25 14:07:20 UTC (rev 275028)
@@ -1,3 +1,12 @@
+2021-03-24 Philippe Normand <[email protected]>
+
+ REGRESSION(r274870) fast/canvas/webgl/texImage2D-mse-flipY-true.html and fast/canvas/webgl/texImage2D-mse-flipY-false.html are crashing
+ https://bugs.webkit.org/show_bug.cgi?id=223674
+
+ Reviewed by Kenneth Russell.
+
+ * platform/glib/TestExpectations:
+
2021-03-23 Philippe Normand <[email protected]>
[MSE][GStreamer] SIGSEV in webKitMediaSrcFreeStream
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (275027 => 275028)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-03-25 14:07:14 UTC (rev 275027)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-03-25 14:07:20 UTC (rev 275028)
@@ -1,3 +1,17 @@
+2021-03-24 Philippe Normand <[email protected]>
+
+ REGRESSION(r274870) fast/canvas/webgl/texImage2D-mse-flipY-true.html and fast/canvas/webgl/texImage2D-mse-flipY-false.html are crashing
+ https://bugs.webkit.org/show_bug.cgi?id=223674
+
+ Reviewed by Kenneth Russell.
+
+ When the srcObject is directly set on a media element, the corresponding URL might still be
+ empty, so we need to ensure the URI corresponding to the MediaSource blob is not empty,
+ otherwise uridecodebin would fail to create the right source element.
+
+ * platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerMSE::load):
+
2021-03-23 Philippe Normand <[email protected]>
[MSE][GStreamer] SIGSEV in webKitMediaSrcFreeStream
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp (275027 => 275028)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp 2021-03-25 14:07:14 UTC (rev 275027)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp 2021-03-25 14:07:20 UTC (rev 275028)
@@ -130,7 +130,8 @@
void MediaPlayerPrivateGStreamerMSE::load(const URL& url, const ContentType&, MediaSourcePrivateClient* mediaSource)
{
- GST_DEBUG("Loading %s", url.string().ascii().data());
+ auto mseBlobURI = makeString("mediasource", url.string().isEmpty() ? "blob://" : url.string());
+ GST_DEBUG("Loading %s", mseBlobURI.ascii().data());
m_mediaSource = mediaSource;
if (!m_playbackPipeline)
@@ -138,7 +139,7 @@
m_mediaSourcePrivate = MediaSourcePrivateGStreamer::open(*m_mediaSource.get(), *this);
- MediaPlayerPrivateGStreamer::load(makeString("mediasource", url.string()));
+ MediaPlayerPrivateGStreamer::load(mseBlobURI);
}
void MediaPlayerPrivateGStreamerMSE::pause()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
