Unreviewed, rolling out r219194.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Jul 2017 17:12:54 +0000 (17:12 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Jul 2017 17:12:54 +0000 (17:12 +0000)
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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@219202 268f45cc-cd09-0410-ab3c-d52691b4dbfc

13 files changed:
LayoutTests/ChangeLog
LayoutTests/http/tests/media/hls/range-request-expected.txt [deleted file]
LayoutTests/http/tests/media/hls/range-request.html [deleted file]
LayoutTests/http/tests/media/resources/hls/range-request-playlist.m3u8 [deleted file]
LayoutTests/http/tests/media/resources/hls/range-request-playlists/iframes.m3u8 [deleted file]
LayoutTests/http/tests/media/resources/hls/range-request-playlists/media.ts [deleted file]
LayoutTests/http/tests/media/resources/hls/range-request-playlists/stream.m3u8 [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
Tools/ChangeLog
Tools/gtk/jhbuild.modules

index 47a5b07..10fcd44 100644 (file)
@@ -1,3 +1,16 @@
+2017-07-06  Commit Queue  <commit-queue@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  <cturner@igalia.com>
 
         [GStreamer] vid.me videos do not play
diff --git a/LayoutTests/http/tests/media/hls/range-request-expected.txt b/LayoutTests/http/tests/media/hls/range-request-expected.txt
deleted file mode 100644 (file)
index 776c6dd..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-EVENT(playing)
-
diff --git a/LayoutTests/http/tests/media/hls/range-request.html b/LayoutTests/http/tests/media/hls/range-request.html
deleted file mode 100644 (file)
index 12ba34f..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <script src=../../media-resources/video-test.js></script>
-        <script src=../../media-resources/media-controls.js></script>
-        <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 = "../resources/hls/range-request-playlist.m3u8";
-            }
-        </script>
-    </head>
-    <body onload="start()">
-        <video id="video"></video>
-    </body>
-</html>
diff --git a/LayoutTests/http/tests/media/resources/hls/range-request-playlist.m3u8 b/LayoutTests/http/tests/media/resources/hls/range-request-playlist.m3u8
deleted file mode 100644 (file)
index 64b65bd..0000000
+++ /dev/null
@@ -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"
diff --git a/LayoutTests/http/tests/media/resources/hls/range-request-playlists/iframes.m3u8 b/LayoutTests/http/tests/media/resources/hls/range-request-playlists/iframes.m3u8
deleted file mode 100644 (file)
index 06cb560..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#EXTM3U
-#EXT-X-VERSION:4
-#EXT-X-PLAYLIST-TYPE:VOD
-#EXT-X-I-FRAMES-ONLY
-#EXT-X-INDEPENDENT-SEGMENTS
-#EXT-X-TARGETDURATION:1
-#EXT-X-MEDIA-SEQUENCE:0
-#EXTINF:1.000000,
-#EXT-X-BYTERANGE:21808@376
-media.ts
-#EXTINF:1.000000,
-#EXT-X-BYTERANGE:20680@44180
-media.ts
-#EXTINF:1.000000,
-#EXT-X-BYTERANGE:24440@87044
-media.ts
-#EXTINF:1.000000,
-#EXT-X-BYTERANGE:21056@134044
-media.ts
-#EXTINF:1.000000,
-#EXT-X-BYTERANGE:24252@177848
-media.ts
-#EXTINF:1.000000,
-#EXT-X-BYTERANGE:21056@224284
-media.ts
-#EXTINF:1.000000,
-#EXT-X-BYTERANGE:24252@268464
-media.ts
-#EXTINF:1.000000,
-#EXT-X-BYTERANGE:21056@315088
-media.ts
-#EXTINF:1.000000,
-#EXT-X-BYTERANGE:24252@358892
-media.ts
-#EXTINF:0.958333,
-#EXT-X-BYTERANGE:21056@405892
-media.ts
-#EXT-X-ENDLIST
diff --git a/LayoutTests/http/tests/media/resources/hls/range-request-playlists/media.ts b/LayoutTests/http/tests/media/resources/hls/range-request-playlists/media.ts
deleted file mode 100644 (file)
index f798d6b..0000000
Binary files a/LayoutTests/http/tests/media/resources/hls/range-request-playlists/media.ts and /dev/null differ
diff --git a/LayoutTests/http/tests/media/resources/hls/range-request-playlists/stream.m3u8 b/LayoutTests/http/tests/media/resources/hls/range-request-playlists/stream.m3u8
deleted file mode 100644 (file)
index 58742d6..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#EXTM3U
-#EXT-X-VERSION:4
-#EXT-X-PLAYLIST-TYPE:VOD
-#EXT-X-INDEPENDENT-SEGMENTS
-#EXT-X-TARGETDURATION:3
-#EXT-X-MEDIA-SEQUENCE:0
-#EXTINF:3.000000,
-#EXT-X-BYTERANGE:133668@0
-media.ts
-#EXTINF:3.000000,
-#EXT-X-BYTERANGE:134420@133668
-media.ts
-#EXTINF:3.000000,
-#EXT-X-BYTERANGE:137428@268088
-media.ts
-#EXTINF:0.958333,
-#EXT-X-BYTERANGE:44180@405516
-media.ts
-#EXT-X-ENDLIST
index 8fb5a08..29ab3cf 100644 (file)
@@ -1,3 +1,16 @@
+2017-07-06  Commit Queue  <commit-queue@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  <ddkilzer@apple.com>
 
         Add release assert to explore crash for <rdar://problem/32908525>
index 119ce68..dd48e32 100644 (file)
@@ -210,22 +210,6 @@ MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer()
     }
 }
 
-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 @@ void MediaPlayerPrivateGStreamer::load(const String& urlString)
     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,7 +232,10 @@ void MediaPlayerPrivateGStreamer::load(const String& urlString)
 
     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.");
@@ -1687,7 +1679,8 @@ bool MediaPlayerPrivateGStreamer::loadNextLocation()
             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;
             }
index 3a30a23..40b20e9 100644 (file)
@@ -173,8 +173,6 @@ private:
     static void uriDecodeBinElementAddedCallback(GstBin*, GstElement*, MediaPlayerPrivateGStreamer*);
     static void downloadBufferFileCreatedCallback(MediaPlayerPrivateGStreamer*);
 
-    void setPlaybinURL(const URL& urlString);
-
 protected:
     void cacheDuration();
 
index c06d226..7b29954 100644 (file)
@@ -727,18 +727,10 @@ static GstURIType webKitWebSrcUriGetType(GType)
 
 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 = WEBKIT_WEB_SRC(handler);
@@ -766,7 +758,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri, GEr
     if (!uri)
         return TRUE;
 
-    URL url = convertPlaybinURI(uri);
+    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;
index 32bb7e5..fb30853 100644 (file)
@@ -1,3 +1,16 @@
+2017-07-06  Commit Queue  <commit-queue@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  <jlewis3@apple.com>
 
         Unreviewed, rolling out r219178.
index 70f2d6c..7d9a113 100644 (file)
   </autotools>
 
   <autotools id="libsoup"
-             autogenargs="--disable-introspection">
+             autogenargs="--without-gnome --disable-introspection">
     <if condition-set="macos">
       <autogenargs value="--disable-tls-check"/>
     </if>
             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>