Changeset 142251 in webkit

Timestamp:

Feb 8, 2013 3:15:27 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r141695 and r141697.
​http://trac.webkit.org/changeset/141695
​http://trac.webkit.org/changeset/141697
​https://bugs.webkit.org/show_bug.cgi?id=109279

broke on-disk buffering for http(s) media (Requested by philn
on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2013-02-08

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::load):

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:

(MediaPlayerPrivateGStreamer):

• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:

(webKitWebSrcGetProtocols):
(webKitWebSrcSetUri):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (4 diffs)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (modified) (2 diffs)
• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-08  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r141695 and r141697.
+        http://trac.webkit.org/changeset/141695
+        http://trac.webkit.org/changeset/141697
+        https://bugs.webkit.org/show_bug.cgi?id=109279
+
+        broke on-disk buffering for http(s) media (Requested by philn
+        on #webkit).
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::load):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+        (MediaPlayerPrivateGStreamer):
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (webKitWebSrcGetProtocols):
+        (webKitWebSrcSetUri):
+
 2013-02-08  Dan Carney  <dcarney@google.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

@@ -219 +219 @@
 }
 
-KURL MediaPlayerPrivateGStreamer::convertPlaybinURL(const gchar* uri)
-{
-    KURL url(KURL(), uri);
-
-    ASSERT(url.protocol().substring(0, 7) == "webkit+");
-    url.setProtocol(url.protocol().substring(7));
-    return url;
-}
-
-void MediaPlayerPrivateGStreamer::setPlaybinURL(KURL& url)
-{
+void MediaPlayerPrivateGStreamer::load(const String& url)
+{
+    if (!initializeGStreamerAndRegisterWebKitElements())
+        return;
+
+    KURL kurl(KURL(), url);
+    String cleanUrl(url);
+
     // Clean out everything after file:// url path.
-    if (url.isLocalFile()) {
-        url.setQuery(String());
-        url.removeFragmentIdentifier();
-    }
-
-    m_url = url;
-
-    if (url.protocolIsInHTTPFamily())
-        url.setProtocol("webkit+" + url.protocol());
-
-    LOG_MEDIA_MESSAGE("Load %s", url.string().utf8().data());
-    g_object_set(m_playBin.get(), "uri", url.string().utf8().data(), NULL);
-}
-
-void MediaPlayerPrivateGStreamer::load(const String& url)
-{
-    if (!initializeGStreamerAndRegisterWebKitElements())
-        return;
+    if (kurl.isLocalFile())
+        cleanUrl = cleanUrl.substring(0, kurl.pathEnd());
 
     if (!m_playBin) {
@@ -257 +238 @@
     ASSERT(m_playBin);
 
-    KURL kurl(KURL(), url);
-    setPlaybinURL(kurl);
+    m_url = KURL(KURL(), cleanUrl);
+    g_object_set(m_playBin.get(), "uri", cleanUrl.utf8().data(), NULL);
+
+    LOG_MEDIA_MESSAGE("Load %s", cleanUrl.utf8().data());
 
     if (m_preload == MediaPlayer::None) {
@@ -1202 +1185 @@
         // append the value of new-location to it.
 
+        gchar* currentLocation = 0;
+        g_object_get(m_playBin.get(), "uri", &currentLocation, NULL);
+
+        KURL currentUrl(KURL(), currentLocation);
+        g_free(currentLocation);
+
         KURL newUrl;
+
         if (gst_uri_is_valid(newLocation))
             newUrl = KURL(KURL(), newLocation);
         else
-            newUrl = KURL(KURL(), m_url.baseAsString() + newLocation);
-
-        RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(m_url);
+            newUrl = KURL(KURL(), currentUrl.baseAsString() + newLocation);
+
+        RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(currentUrl);
         if (securityOrigin->canRequest(newUrl)) {
             LOG_MEDIA_MESSAGE("New media url: %s", newUrl.string().utf8().data());
@@ -1226 +1216 @@
             if (state <= GST_STATE_READY) {
                 // Set the new uri and start playing.
-                setPlaybinURL(newUrl);
+                g_object_set(m_playBin.get(), "uri", newUrl.string().utf8().data(), NULL);
                 gst_element_set_state(m_playBin.get(), GST_STATE_PLAYING);
                 return true;

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h

@@ -90 +90 @@
             GstElement* audioSink() const;
 
-            static KURL convertPlaybinURL(const gchar* uri);
-
         private:
             MediaPlayerPrivateGStreamer(MediaPlayer*);
@@ -99 +97 @@
             static void getSupportedTypes(HashSet<String>&);
             static MediaPlayer::SupportsType supportsType(const String& type, const String& codecs, const KURL&);
-
-            void setPlaybinURL(KURL&);
 
             static bool isAvailable();

trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp

@@ -28 +28 @@
 #include "GStreamerVersioning.h"
 #include "MediaPlayer.h"
-#include "MediaPlayerPrivateGStreamer.h"
 #include "NetworkingContext.h"
 #include "NotImplemented.h"
@@ -579 +578 @@
 const gchar* const* webKitWebSrcGetProtocols(GType)
 {
-    static const char* const protocols[] = {"webkit+http", "webkit+https", 0 };
+    static const char* protocols[] = {"http", "https", 0 };
     return protocols;
 }
@@ -604 +603 @@
         return TRUE;
 
-    KURL url = WebCore::MediaPlayerPrivateGStreamer::convertPlaybinURL(uri);
+    KURL url(KURL(), uri);
 
     if (!url.isValid() || !url.protocolIsInHTTPFamily()) {
@@ -623 +622 @@
 static gchar** webKitWebSrcGetProtocols(void)
 {
-    static gchar* protocols[] = {(gchar*) "webkit+http", (gchar*) "webkit+https", 0 };
+    static gchar* protocols[] = {(gchar*) "http", (gchar*) "https", 0 };
     return protocols;
 }
@@ -648 +647 @@
         return TRUE;
 
-    KURL url = WebCore::MediaPlayerPrivateGStreamer::convertPlaybinURL(uri);
+    KURL url(KURL(), uri);
 
     if (!url.isValid() || !url.protocolIsInHTTPFamily()) {