Changeset 228945 in webkit

Timestamp:

Feb 23, 2018 2:06:46 AM (6 years ago)

Author:

Philippe Normand

Message:

[GStreamer] HTTP totalBytes query returns 0 after seeking (sometimes)
​https://bugs.webkit.org/show_bug.cgi?id=183002

Reviewed by Xabier Rodriguez-Calvar.

• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:

(webkit_web_src_init): Initialize member variables. Also no need
to set the appsrc size at that point.
(webKitWebSrcStop): There is no need to reset the size when
seeking. Size should in most cases represent the Content-Length
response attribute, even when seeking.
(webKitWebSrcStart): No need to reset the size attribute.
(webKitWebSrcQueryWithParent): Let appsrc handle DURATION queries.
(CachedResourceStreamingClient::responseReceived): Emit duration notification one time only.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-23  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] HTTP totalBytes query returns 0 after seeking (sometimes)
+        https://bugs.webkit.org/show_bug.cgi?id=183002
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (webkit_web_src_init): Initialize member variables. Also no need
+        to set the appsrc size at that point.
+        (webKitWebSrcStop): There is no need to reset the size when
+        seeking. Size should in most cases represent the Content-Length
+        response attribute, even when seeking.
+        (webKitWebSrcStart): No need to reset the size attribute.
+        (webKitWebSrcQueryWithParent): Let appsrc handle DURATION queries.
+        (CachedResourceStreamingClient::responseReceived): Emit duration notification one time only.
+
 2018-02-23  Philippe Normand  <pnormand@igalia.com>
 

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

@@ -84 +84 @@
 
     guint64 offset;
+    bool haveSize;
     guint64 size;
     gboolean seekable;
@@ -205 +206 @@
     priv->notifier = MainThreadNotifier<MainThreadSourceNotification>::create();
 
+    priv->haveSize = FALSE;
+    priv->size = 0;
+
     priv->appsrc = GST_APP_SRC(gst_element_factory_make("appsrc", nullptr));
     if (!priv->appsrc) {
@@ -247 +251 @@
 
     gst_app_src_set_caps(priv->appsrc, nullptr);
-    gst_app_src_set_size(priv->appsrc, -1);
 }
 
@@ -361 +364 @@
 
     if (!wasSeeking) {
-        priv->size = 0;
         priv->requestedOffset = 0;
         priv->player = nullptr;
@@ -446 +448 @@
     request.setAllowCookies(true);
     request.setFirstPartyForCookies(url);
-
-    priv->size = 0;
 
     request.setHTTPReferrer(priv->player->referrer());
@@ -564 +564 @@
 
     switch (GST_QUERY_TYPE(query)) {
-    case GST_QUERY_DURATION: {
-        GstFormat format;
-
-        gst_query_parse_duration(query, &format, nullptr);
-
-        GST_LOG_OBJECT(src, "duration query in format %s, current size: %lu", gst_format_get_name(format), priv->size);
-        if (format == GST_FORMAT_BYTES && priv->size > 0) {
-            gst_query_set_duration(query, format, priv->size);
-            result = TRUE;
-        }
-        break;
-    }
     case GST_QUERY_URI: {
         gst_query_set_uri(query, priv->originalURI.data());
@@ -793 +781 @@
         length += priv->requestedOffset;
 
-    priv->size = length >= 0 ? length : 0;
     priv->seekable = length > 0 && g_ascii_strcasecmp("none", response.httpHeaderField(HTTPHeaderName::AcceptRanges).utf8().data());
 
-    GST_DEBUG_OBJECT(src, "Size: %" G_GINT64_FORMAT ", seekable: %s", priv->size, priv->seekable ? "yes" : "no");
+    GST_DEBUG_OBJECT(src, "Size: %lld, seekable: %s", length, priv->seekable ? "yes" : "no");
     // notify size/duration
-    if (length > 0)
-        gst_app_src_set_size(priv->appsrc, length);
-    else {
+    if (length > 0) {
+        if (!priv->haveSize || (static_cast<long long>(priv->size) != length)) {
+            priv->haveSize = TRUE;
+            priv->size = length;
+            gst_app_src_set_size(priv->appsrc, length);
+        }
+    } else {
         gst_app_src_set_size(priv->appsrc, -1);
         if (!priv->seekable)