Changeset 141695 in webkit

Timestamp:

Feb 2, 2013 8:00:53 AM (11 years ago)

Author:

Philippe Normand

Message:

[GStreamer] webkitwebsrc is exposed to application-side
​https://bugs.webkit.org/show_bug.cgi?id=108088

Reviewed by Martin Robinson.

Switch the webkitwebsrc to handle webkit+http(s) uris so it is now
explicit that this element is meant to be used preferrably inside
WebKit. This change is internal to the player.

No new tests, covered by existing http/tests/media tests.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::setPlaybinURL):
(WebCore):
(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-01  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] webkitwebsrc is exposed to application-side
+        https://bugs.webkit.org/show_bug.cgi?id=108088
+
+        Reviewed by Martin Robinson.
+
+        Switch the webkitwebsrc to handle webkit+http(s) uris so it is now
+        explicit that this element is meant to be used preferrably inside
+        WebKit. This change is internal to the player.
+
+        No new tests, covered by existing http/tests/media tests.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::setPlaybinURL):
+        (WebCore):
+        (WebCore::MediaPlayerPrivateGStreamer::load):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+        (MediaPlayerPrivateGStreamer):
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (webKitWebSrcGetProtocols):
+        (webKitWebSrcSetUri):
+
 2013-02-02  Simon Hausmann  <simon.hausmann@digia.com>
 

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

@@ -305 +305 @@
 }
 
+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)
+{
+    // Clean out everything after file:// url path.
+    if (url.isLocalFile())
+        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;
-
-    KURL kurl(KURL(), url);
-    String cleanUrl(url);
-
-    // Clean out everything after file:// url path.
-    if (kurl.isLocalFile())
-        cleanUrl = cleanUrl.substring(0, kurl.pathEnd());
 
     if (!m_playBin) {
@@ -324 +341 @@
     ASSERT(m_playBin);
 
-    m_url = KURL(KURL(), cleanUrl);
-    g_object_set(m_playBin.get(), "uri", cleanUrl.utf8().data(), NULL);
-
-    LOG_MEDIA_MESSAGE("Load %s", cleanUrl.utf8().data());
+    KURL kurl(KURL(), url);
+    setPlaybinURL(kurl);
 
     if (m_preload == MediaPlayer::None) {
@@ -1416 +1431 @@
         // 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(), currentUrl.baseAsString() + newLocation);
-
-        RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(currentUrl);
+            newUrl = KURL(KURL(), m_url.baseAsString() + newLocation);
+
+        RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(m_url);
         if (securityOrigin->canRequest(newUrl)) {
             LOG_MEDIA_MESSAGE("New media url: %s", newUrl.string().utf8().data());
@@ -1447 +1455 @@
             if (state <= GST_STATE_READY) {
                 // Set the new uri and start playing.
-                g_object_set(m_playBin.get(), "uri", newUrl.string().utf8().data(), NULL);
+                setPlaybinURL(newUrl);
                 gst_element_set_state(m_playBin.get(), GST_STATE_PLAYING);
                 return true;

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

@@ -140 +140 @@
             MediaPlayer* mediaPlayer() const { return m_player; }
 
+            static KURL convertPlaybinURL(const gchar* uri);
+
         private:
             MediaPlayerPrivateGStreamer(MediaPlayer*);
@@ -147 +149 @@
             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

@@ -27 +27 @@
 #include "GStreamerVersioning.h"
 #include "MediaPlayer.h"
+#include "MediaPlayerPrivateGStreamer.h"
 #include "NetworkingContext.h"
 #include "NotImplemented.h"
@@ -549 +550 @@
 const gchar* const* webKitWebSrcGetProtocols(GType)
 {
-    static const char* protocols[] = {"http", "https", 0 };
+    static const char* const protocols[] = {"webkit+http", "webkit+https", 0 };
     return protocols;
 }
@@ -574 +575 @@
         return TRUE;
 
-    KURL url(KURL(), uri);
+    KURL url = WebCore::MediaPlayerPrivateGStreamer::convertPlaybinURL(uri);
 
     if (!url.isValid() || !url.protocolIsInHTTPFamily()) {
@@ -593 +594 @@
 static gchar** webKitWebSrcGetProtocols(void)
 {
-    static gchar* protocols[] = {(gchar*) "http", (gchar*) "https", 0 };
+    static gchar* protocols[] = {(gchar*) "webkit+http", (gchar*) "webkit+https", 0 };
     return protocols;
 }
@@ -618 +619 @@
         return TRUE;
 
-    KURL url(KURL(), uri);
+    KURL url = WebCore::MediaPlayerPrivateGStreamer::convertPlaybinURL(uri);
 
     if (!url.isValid() || !url.protocolIsInHTTPFamily()) {