Changeset 159746 in webkit

Timestamp:

Nov 25, 2013 6:03:25 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[GStreamer] Seeking fails on media content provided by servers not supporting Range requests
​https://bugs.webkit.org/show_bug.cgi?id=85994

Patch by Andres Gomez <Andres Gomez> on 2013-11-25
Reviewed by Philippe Normand.

Source/WebCore:

Based on the patch written by Andre Moreira Magalhaes.

When the GStreamer web source was doing a "Range" request we were
expecting to receive a 206 status reply with the "Content-Range"
header and just the requested data. Supporting "Range" requests is
not mandatory so, for the servers not supporting it they will be
replying with a 200 status and the whole content of the media
element. Now, we are properly handling these replies too.

Test: http/tests/media/media-seeking-no-ranges-server.html

• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:

(StreamingClient::handleResponseReceived): Do not fail when
receiving 200 as response for HTTP range requests.
(StreamingClient::handleDataReceived): Manually seek on stream
when receiving the full data after a seek.

LayoutTests:

Added test to check that seeking media files on http servers not
supporting "Range" requests doesn't trigger an error.

• http/tests/media/media-seeking-no-ranges-server-expected.txt: Added.
• http/tests/media/media-seeking-no-ranges-server.html: Added.
• http/tests/media/resources/load-video.php: Added support for new

"ranges" paramenter.

• http/tests/media/resources/serve-video.php: Added support for

new "ranges" paramenter. When "ranges" is "no" we always answer
the HTTP status "200 OK" and send the whole file.

• platform/mac/TestExpectations: New test skipped in Mac port as

media playback download control is passed to AVFoundation that
doesn't like fancy PHP URLs like the one used in the test and, in
addition, they won't care about HTTP servers not supporting
"Range" requests.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/media/media-seeking-no-ranges-server-expected.txt (added)
• LayoutTests/http/tests/media/media-seeking-no-ranges-server.html (added)
• LayoutTests/http/tests/media/resources/load-video.php (modified) (1 diff)
• LayoutTests/http/tests/media/resources/serve-video.php (modified) (2 diffs)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-11-25  Andres Gomez  <agomez@igalia.com>
+
+        [GStreamer] Seeking fails on media content provided by servers not supporting Range requests
+        https://bugs.webkit.org/show_bug.cgi?id=85994
+
+        Reviewed by Philippe Normand.
+
+        Added test to check that seeking media files on http servers not
+        supporting "Range" requests doesn't trigger an error.
+
+        * http/tests/media/media-seeking-no-ranges-server-expected.txt: Added.
+        * http/tests/media/media-seeking-no-ranges-server.html: Added.
+        * http/tests/media/resources/load-video.php: Added support for new
+        "ranges" paramenter.
+        * http/tests/media/resources/serve-video.php: Added support for
+        new "ranges" paramenter. When "ranges" is "no" we always answer
+        the HTTP status "200 OK" and send the whole file.
+        * platform/mac/TestExpectations: New test skipped in Mac port as
+        media playback download control is passed to AVFoundation that
+        doesn't like fancy PHP URLs like the one used in the test and, in
+        addition, they won't care about HTTP servers not supporting
+        "Range" requests.
+
 2013-11-25  Mario Sanchez Prada  <mario.prada@samsung.com>
 

trunk/LayoutTests/http/tests/media/resources/load-video.php

@@ -3 +3 @@
     $fileName = $_GET["name"];
     $type = $_GET["type"];
+    if (array_key_exists("ranges", $_GET))
+        $ranges = $_GET["ranges"];
 
     $_GET = array();
     $_GET['name'] = $fileName;
     $_GET['type'] = $type;
-    @include("./serve-video.php"); 
+    if (isset($ranges))
+        $_GET["ranges"] = $ranges;
+    @include("./serve-video.php");
 
 ?>

trunk/LayoutTests/http/tests/media/resources/serve-video.php

@@ -3 +3 @@
     $fileName = $_GET["name"];
     $type = $_GET["type"];
+    if (array_key_exists("ranges", $_GET))
+        $ranges = $_GET["ranges"];
 
     $fileSize = filesize($fileName);
     $start = 0;
     $end = $fileSize - 1;
-    $contentRange = $_SERVER["HTTP_RANGE"];
+    if ($ranges != "no")
+        $contentRange = $_SERVER["HTTP_RANGE"];
     if (isset($contentRange)) {
-        $range = explode("-", substr($contentRange, strlen("bytes="))); 
-        $start = intval($range[0]); 
+        $range = explode("-", substr($contentRange, strlen("bytes=")));
+        $start = intval($range[0]);
         if (!empty($range[1]))
             $end = intval($range[1]);
@@ -23 +26 @@
     header("Etag: " . '"' . $fileSize . "-" . filemtime($fileName) . '"');
     header("Content-Type: " . $type);
-    header("Accept-Ranges: bytes");
+    if ($ranges != "no")
+        header("Accept-Ranges: bytes");
     header("Content-Length: " . ($end - $start + 1));
-    if ($contentRange)
-                header("Content-Range: bytes " . $start . "-" . $end . "/" . $fileSize); 
+    if (isset($contentRange))
+        header("Content-Range: bytes " . $start . "-" . $end . "/" . $fileSize);
     header("Connection: close");
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -591 +591 @@
 media/media-fullscreen-not-in-document.html
 
+# Media playback control is passed to AVFoundation that doesn't like fancy PHP URLs like the one used in the test and, in addition, they won't care about HTTP servers not supporting "Range" requests
+http/tests/media/media-seeking-no-ranges-server.html
+
 # <rdar://problem/11358748> http/tests/multipart/multipart-wait-before-boundary.html fails on ML as of r115745
 http/tests/multipart/multipart-wait-before-boundary.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-25  Andres Gomez  <agomez@igalia.com>
+
+        [GStreamer] Seeking fails on media content provided by servers not supporting Range requests
+        https://bugs.webkit.org/show_bug.cgi?id=85994
+
+        Reviewed by Philippe Normand.
+
+        Based on the patch written by Andre Moreira Magalhaes.
+
+        When the GStreamer web source was doing a "Range" request we were
+        expecting to receive a 206 status reply with the "Content-Range"
+        header and just the requested data. Supporting "Range" requests is
+        not mandatory so, for the servers not supporting it they will be
+        replying with a 200 status and the whole content of the media
+        element. Now, we are properly handling these replies too.
+
+        Test: http/tests/media/media-seeking-no-ranges-server.html
+
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (StreamingClient::handleResponseReceived): Do not fail when
+        receiving 200 as response for HTTP range requests.
+        (StreamingClient::handleDataReceived): Manually seek on stream
+        when receiving the full data after a seek.
+
 2013-11-25  Radu Stavila  <stavila@adobe.com>
 

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

@@ -840 +840 @@
     GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
 
-    // If we seeked we need 206 == PARTIAL_CONTENT
-    if (priv->requestedOffset && response.httpStatusCode() != 206) {
-        locker.unlock();
-        GST_ELEMENT_ERROR(src, RESOURCE, READ, (0), (0));
-        gst_app_src_end_of_stream(priv->appsrc);
-        webKitWebSrcStop(src);
+    if (priv->seekID) {
+        GST_DEBUG_OBJECT(src, "Seek in progress, ignoring response");
         return;
     }
 
+    if (priv->requestedOffset) {
+        // Seeking ... we expect a 206 == PARTIAL_CONTENT
+        if (response.httpStatusCode() == 200) {
+            // Range request didn't have a ranged response; resetting offset.
+            priv->offset = 0;
+        } else if (response.httpStatusCode() != 206) {
+            // Range request completely failed.
+            locker.unlock();
+            GST_ELEMENT_ERROR(src, RESOURCE, READ, ("Received unexpected %d HTTP status code", response.httpStatusCode()), (0));
+            gst_app_src_end_of_stream(priv->appsrc);
+            webKitWebSrcStop(src);
+            return;
+        }
+    }
+
     long long length = response.expectedContentLength();
-    if (length > 0)
+    if (length > 0 && priv->requestedOffset && response.httpStatusCode() == 206)
         length += priv->requestedOffset;
 
@@ -933 +944 @@
         priv->buffer.clear();
         return;
+    }
+
+    if (priv->offset < priv->requestedOffset) {
+        // Range request failed; seeking manually.
+        if (priv->offset + length <= priv->requestedOffset) {
+            // Discard all the buffers coming before the requested seek position.
+            priv->offset += length;
+            priv->buffer.clear();
+            return;
+        }
+
+        if (priv->offset + length > priv->requestedOffset) {
+            guint64 offset = priv->requestedOffset - priv->offset;
+            data += offset;
+            length -= offset;
+            if (priv->buffer)
+                gst_buffer_resize(priv->buffer.get(), offset, -1);
+            priv->offset = priv->requestedOffset;
+        }
+
+        priv->requestedOffset = 0;
     }