Changeset 257977 in webkit

Timestamp:

Mar 6, 2020 4:41:27 AM (4 years ago)

Author:

eocanha@igalia.com

Message:

[GStreamer] Streaming aac/mp3 audio doesn't always work
​https://bugs.webkit.org/show_bug.cgi?id=205801

Reviewed by Philippe Normand.

Source/WebCore:

Don't rely on response size to replace Content-Length. This may break streaming videos,
which should always have an Infinite duration.

This patch is based on the fix found by Philippe Normand <​pnormand@igalia.com>

Test: http/tests/media/video-no-content-length-stall.html

• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:

(CachedResourceStreamingClient::dataReceived):

LayoutTests:

The new test checks that end-of-stream (thus, end of playback) isn't triggered when a live
audio stream is being played. Live streams don't have Content-Length and are loaded as
they are generated (no future data is available immediately). This is simulated by omitting
Content-Length and artificially stalling the stream at a given offset.

• http/tests/media/resources/serve-video.php: Now the file continues to be served after

the stall when stallOffset/stallDuration are used.

• http/tests/media/video-no-content-length-stall-expected.txt: Added.
• http/tests/media/video-no-content-length-stall.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/media/resources/serve-video.php (modified) (2 diffs)
• LayoutTests/http/tests/media/video-no-content-length-stall-expected.txt (added)
• LayoutTests/http/tests/media/video-no-content-length-stall.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-03-06  Enrique Ocaña González  <eocanha@igalia.com>
+
+        [GStreamer] Streaming aac/mp3 audio doesn't always work
+        https://bugs.webkit.org/show_bug.cgi?id=205801
+
+        Reviewed by Philippe Normand.
+
+        The new test checks that end-of-stream (thus, end of playback) isn't triggered when a live
+        audio stream is being played. Live streams don't have Content-Length and are loaded as
+        they are generated (no future data is available immediately). This is simulated by omitting
+        Content-Length and artificially stalling the stream at a given offset.
+
+        * http/tests/media/resources/serve-video.php: Now the file continues to be served after
+        the stall when stallOffset/stallDuration are used.
+        * http/tests/media/video-no-content-length-stall-expected.txt: Added.
+        * http/tests/media/video-no-content-length-stall.html: Added.
+
 2020-03-06  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -145 +145 @@
         set_time_limit(0);
 
+    $stalledOnce = false;
     while (!feof($fn) && $offset <= $end && connection_status() == 0) {
         $readSize = min($settings["chunkSize"], ($end - $offset) + 1);
         $stallNow = false;
-        if ($settings["stallOffset"] && $settings["stallOffset"] >= $offset && $settings["stallOffset"] < $offset + $readSize) {
+        if (!$stalledOnce && $settings["stallOffset"] && $settings["stallOffset"] >= $offset && $settings["stallOffset"] < $offset + $readSize) {
             $readSize = min($settings["chunkSize"], $settings["stallOffset"] - $offset);
             $stallNow = true;
@@ -154 +155 @@
 
         $buffer = fread($fn, $readSize);
+        $readLength = strlen($buffer);
+
         print($buffer);
         flush();
-        $offset += $settings["chunkSize"];
+        $offset += $readLength;
         
-        if ($stallNow)
+        if ($stallNow) {
             sleep($settings["stallDuration"]);
+            $stalledOnce = true;
+        }
     }
     fclose($fn);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-06  Enrique Ocaña González  <eocanha@igalia.com>
+
+        [GStreamer] Streaming aac/mp3 audio doesn't always work
+        https://bugs.webkit.org/show_bug.cgi?id=205801
+
+        Reviewed by Philippe Normand.
+
+        Don't rely on response size to replace Content-Length. This may break streaming videos,
+        which should always have an Infinite duration.
+
+        This patch is based on the fix found by Philippe Normand <pnormand@igalia.com>
+
+        Test: http/tests/media/video-no-content-length-stall.html
+
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (CachedResourceStreamingClient::dataReceived):
+
 2020-03-06  Frederic Wang  <fwang@igalia.com>
 

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

@@ -1172 +1172 @@
         GST_DEBUG_OBJECT(src, "Got position previous estimated content size (%" G_GINT64_FORMAT " > %" G_GINT64_FORMAT ")", newPosition, priv->size);
         newSize = newPosition;
-    } else if (!priv->haveSize) {
-        GST_DEBUG_OBJECT(src, "Got initial response without Content-Length, assuming response size as duration.");
-        newSize = length;
-        priv->haveSize = true;
     }