Changeset 148079 in webkit

Timestamp:

Apr 9, 2013 11:59:28 PM (11 years ago)

Author:

Philippe Normand

Message:

[GStreamer] playbin uri getter is invalid
​https://bugs.webkit.org/show_bug.cgi?id=113884

Reviewed by Martin Robinson.

Source/WebCore:

When loading a new media location use the url stored as a member
variable instead of the one stored as a playbin property. The uri
property semantic changed in playbin since 0.10.36+. One should
now use current-uri but to avoid ifdefs depending on GStreamer
version we simply use the url already known as member variable.

Test: http/tests/media/video-redirect.html

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

LayoutTests:

New test for Quicktime reference movie redirect
support.

• http/tests/media/resources/redirect-to-counting-captioned.mov: Added.
• http/tests/media/video-redirect-expected.txt: Added.
• http/tests/media/video-redirect.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/media/resources/redirect-to-counting-captioned.mov (added)
• LayoutTests/http/tests/media/video-redirect-expected.txt (added)
• LayoutTests/http/tests/media/video-redirect.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-09  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] playbin uri getter is invalid
+        https://bugs.webkit.org/show_bug.cgi?id=113884
+
+        Reviewed by Martin Robinson.
+
+        New test for Quicktime reference movie redirect
+        support.
+
+        * http/tests/media/resources/redirect-to-counting-captioned.mov: Added.
+        * http/tests/media/video-redirect-expected.txt: Added.
+        * http/tests/media/video-redirect.html: Added.
+
 2013-04-09  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-09  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] playbin uri getter is invalid
+        https://bugs.webkit.org/show_bug.cgi?id=113884
+
+        Reviewed by Martin Robinson.
+
+        When loading a new media location use the url stored as a member
+        variable instead of the one stored as a playbin property. The uri
+        property semantic changed in playbin since 0.10.36+. One should
+        now use current-uri but to avoid ifdefs depending on GStreamer
+        version we simply use the url already known as member variable.
+
+        Test: http/tests/media/video-redirect.html
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+
 2013-04-09  Geoffrey Garen  <ggaren@apple.com>
 

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

@@ -1288 +1288 @@
         // though. We need to take the base of the current url and
         // 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);
+        KURL baseUrl = gst_uri_is_valid(newLocation) ? KURL() : m_url;
+        KURL newUrl = KURL(baseUrl, newLocation);
+
+        RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(m_url);
         if (securityOrigin->canRequest(newUrl)) {
             LOG_MEDIA_MESSAGE("New media url: %s", newUrl.string().utf8().data());
@@ -1321 +1310 @@
                 // Set the new uri and start playing.
                 g_object_set(m_playBin.get(), "uri", newUrl.string().utf8().data(), NULL);
+                m_url = newUrl;
                 gst_element_set_state(m_playBin.get(), GST_STATE_PLAYING);
                 return true;
             }
-        }
+        } else
+            LOG_MEDIA_MESSAGE("Not allowed to load new media location: %s", newUrl.string().utf8().data());
     }
     m_mediaLocationCurrentIndex--;