Diff
Modified: trunk/LayoutTests/ChangeLog (219201 => 219202)
--- trunk/LayoutTests/ChangeLog 2017-07-06 16:49:16 UTC (rev 219201)
+++ trunk/LayoutTests/ChangeLog 2017-07-06 17:12:54 UTC (rev 219202)
@@ -1,3 +1,16 @@
+2017-07-06 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r219194.
+ https://bugs.webkit.org/show_bug.cgi?id=174207
+
+ it broke some layout tests (Requested by clopez on #webkit).
+
+ Reverted changeset:
+
+ "[GStreamer] vid.me videos do not play"
+ https://bugs.webkit.org/show_bug.cgi?id=172240
+ http://trac.webkit.org/changeset/219194
+
2017-07-06 Charlie Turner <ctur...@igalia.com>
[GStreamer] vid.me videos do not play
Deleted: trunk/LayoutTests/http/tests/media/hls/range-request-expected.txt (219201 => 219202)
--- trunk/LayoutTests/http/tests/media/hls/range-request-expected.txt 2017-07-06 16:49:16 UTC (rev 219201)
+++ trunk/LayoutTests/http/tests/media/hls/range-request-expected.txt 2017-07-06 17:12:54 UTC (rev 219202)
@@ -1,3 +0,0 @@
-
-EVENT(playing)
-
Deleted: trunk/LayoutTests/http/tests/media/hls/range-request.html (219201 => 219202)
--- trunk/LayoutTests/http/tests/media/hls/range-request.html 2017-07-06 16:49:16 UTC (rev 219201)
+++ trunk/LayoutTests/http/tests/media/hls/range-request.html 2017-07-06 17:12:54 UTC (rev 219202)
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <script src=""
- <script src=""
- <script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.setAlwaysAcceptCookies(true);
- testRunner.waitUntilDone();
- }
-
- function playing() {
- testRunner.notifyDone();
- }
-
- function start() {
- video = document.getElementById('video');
- video.autoplay = true
- waitForEvent("playing", playing);
- video.src = ""
- }
- </script>
- </head>
- <body _onload_="start()">
- <video id="video"></video>
- </body>
-</html>
Deleted: trunk/LayoutTests/http/tests/media/resources/hls/range-request-playlist.m3u8 (219201 => 219202)
--- trunk/LayoutTests/http/tests/media/resources/hls/range-request-playlist.m3u8 2017-07-06 16:49:16 UTC (rev 219201)
+++ trunk/LayoutTests/http/tests/media/resources/hls/range-request-playlist.m3u8 2017-07-06 17:12:54 UTC (rev 219202)
@@ -1,11 +0,0 @@
-#EXTM3U
-# Created with Bento4 mp4-hls.py version 1.1.0r615
-
-#EXT-X-VERSION:4
-
-# Media Playlists
-#EXT-X-STREAM-INF:AVERAGE-BANDWIDTH=361262,BANDWIDTH=368806,CODECS="avc1.42C00D",RESOLUTION=640x480
-range-request-playlists/stream.m3u8
-
-# I-Frame Playlists
-#EXT-X-I-FRAME-STREAM-INF:AVERAGE-BANDWIDTH=179875,BANDWIDTH=195520,CODECS="avc1.42C00D",RESOLUTION=640x480,URI="range-request-playlists/iframes.m3u8"
Modified: trunk/Source/WebCore/ChangeLog (219201 => 219202)
--- trunk/Source/WebCore/ChangeLog 2017-07-06 16:49:16 UTC (rev 219201)
+++ trunk/Source/WebCore/ChangeLog 2017-07-06 17:12:54 UTC (rev 219202)
@@ -1,3 +1,16 @@
+2017-07-06 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r219194.
+ https://bugs.webkit.org/show_bug.cgi?id=174207
+
+ it broke some layout tests (Requested by clopez on #webkit).
+
+ Reverted changeset:
+
+ "[GStreamer] vid.me videos do not play"
+ https://bugs.webkit.org/show_bug.cgi?id=172240
+ http://trac.webkit.org/changeset/219194
+
2017-07-06 David Kilzer <ddkil...@apple.com>
Add release assert to explore crash for <rdar://problem/32908525>
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (219201 => 219202)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2017-07-06 16:49:16 UTC (rev 219201)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2017-07-06 17:12:54 UTC (rev 219202)
@@ -210,22 +210,6 @@
}
}
-void MediaPlayerPrivateGStreamer::setPlaybinURL(const URL& url)
-{
- // Clean out everything after file:// url path.
- String cleanURLString(url.string());
- if (url.isLocalFile())
- cleanURLString = cleanURLString.substring(0, url.pathEnd());
-
- m_url = URL(URL(), cleanURLString);
-
- if (m_url.protocolIsInHTTPFamily())
- m_url.setProtocol("webkit+" + url.protocol());
-
- GST_INFO("Load %s", cleanURLString.utf8().data());
- g_object_set(m_pipeline.get(), "uri", cleanURLString.utf8().data(), nullptr);
-}
-
void MediaPlayerPrivateGStreamer::load(const String& urlString)
{
if (!MediaPlayerPrivateGStreamerBase::initializeGStreamerAndRegisterWebKitElements())
@@ -235,6 +219,11 @@
if (url.isBlankURL())
return;
+ // Clean out everything after file:// url path.
+ String cleanURL(urlString);
+ if (url.isLocalFile())
+ cleanURL = cleanURL.substring(0, url.pathEnd());
+
if (!m_pipeline)
createGSTPlayBin();
@@ -243,8 +232,11 @@
ASSERT(m_pipeline);
- setPlaybinURL(url);
+ m_url = URL(URL(), cleanURL);
+ g_object_set(m_pipeline.get(), "uri", cleanURL.utf8().data(), nullptr);
+ GST_INFO("Load %s", cleanURL.utf8().data());
+
if (m_preload == MediaPlayer::None) {
GST_DEBUG("Delaying load.");
m_delayingLoad = true;
@@ -1687,7 +1679,8 @@
gst_element_get_state(m_pipeline.get(), &state, nullptr, 0);
if (state <= GST_STATE_READY) {
// Set the new uri and start playing.
- setPlaybinURL(newUrl);
+ g_object_set(m_pipeline.get(), "uri", newUrl.string().utf8().data(), nullptr);
+ m_url = newUrl;
changePipelineState(GST_STATE_PLAYING);
return true;
}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (219201 => 219202)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2017-07-06 16:49:16 UTC (rev 219201)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2017-07-06 17:12:54 UTC (rev 219202)
@@ -173,8 +173,6 @@
static void uriDecodeBinElementAddedCallback(GstBin*, GstElement*, MediaPlayerPrivateGStreamer*);
static void downloadBufferFileCreatedCallback(MediaPlayerPrivateGStreamer*);
- void setPlaybinURL(const URL& urlString);
-
protected:
void cacheDuration();
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (219201 => 219202)
--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2017-07-06 16:49:16 UTC (rev 219201)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2017-07-06 17:12:54 UTC (rev 219202)
@@ -727,18 +727,10 @@
const gchar* const* webKitWebSrcGetProtocols(GType)
{
- static const char* protocols[] = {"webkit+http", "webkit+https", "blob", nullptr };
+ static const char* protocols[] = {"http", "https", "blob", nullptr };
return protocols;
}
-static URL convertPlaybinURI(const char* uriString)
-{
- URL url(URL(), uriString);
- ASSERT(url.protocol().substring(0, 7) == "webkit+");
- url.setProtocol(url.protocol().substring(7).toString());
- return url;
-}
-
static gchar* webKitWebSrcGetUri(GstURIHandler* handler)
{
WebKitWebSrc* src = ""
@@ -766,7 +758,7 @@
if (!uri)
return TRUE;
- URL url = ""
+ URL url(URL(), uri);
if (!urlHasSupportedProtocol(url)) {
g_set_error(error, GST_URI_ERROR, GST_URI_ERROR_BAD_URI, "Invalid URI '%s'", uri);
return FALSE;
Modified: trunk/Tools/ChangeLog (219201 => 219202)
--- trunk/Tools/ChangeLog 2017-07-06 16:49:16 UTC (rev 219201)
+++ trunk/Tools/ChangeLog 2017-07-06 17:12:54 UTC (rev 219202)
@@ -1,3 +1,16 @@
+2017-07-06 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r219194.
+ https://bugs.webkit.org/show_bug.cgi?id=174207
+
+ it broke some layout tests (Requested by clopez on #webkit).
+
+ Reverted changeset:
+
+ "[GStreamer] vid.me videos do not play"
+ https://bugs.webkit.org/show_bug.cgi?id=172240
+ http://trac.webkit.org/changeset/219194
+
2017-07-06 Matt Lewis <jlew...@apple.com>
Unreviewed, rolling out r219178.
Modified: trunk/Tools/gtk/jhbuild.modules (219201 => 219202)
--- trunk/Tools/gtk/jhbuild.modules 2017-07-06 16:49:16 UTC (rev 219201)
+++ trunk/Tools/gtk/jhbuild.modules 2017-07-06 17:12:54 UTC (rev 219202)
@@ -217,7 +217,7 @@
</autotools>
<autotools id="libsoup"
- autogenargs="--disable-introspection">
+ autogenargs="--without-gnome --disable-introspection">
<if condition-set="macos">
<autogenargs value="--disable-tls-check"/>
</if>
@@ -338,7 +338,7 @@
hash="sha256:f6d245b6b3d4cb733f81ebb021074c525ece83db0c10e932794b339b8d935eb7"/>
</autotools>
- <autotools id="gst-plugins-good" autogen-sh="configure" autogenargs="--disable-examples --disable-gtk-doc">
+ <autotools id="gst-plugins-good" autogen-sh="configure" autogenargs="--disable-examples --disable-soup --disable-gtk-doc">
<if condition-set="macos">
<autogenargs value="--disable-introspection"/>
</if>
