Changeset 218703 in webkit

Timestamp:

Jun 22, 2017 9:43:52 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Spreaker live shows won't play
​https://bugs.webkit.org/show_bug.cgi?id=173306

Patch by Charlie Turner <​cturner@igalia.com> on 2017-06-22
Reviewed by Xabier Rodriguez-Calvar.

This was due to removing the code that negotiated caps for Icecast
streams based on the response headers in r191947. The problem is that
the typefind element can sometimes squint hard enough and see an MP3
stream and attempt to play it, resulting in garbled audio playback. More
commonly typefind fails to recognize the Icecast stream and bails,
resulting in no playback at all.

r191947 also removed the emission of metadata into the pipeline. This
patch also leaves that out since we have no use for it within WebKit.

• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:

(StreamingClient::handleResponseReceived):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-06-22  Charlie Turner  <cturner@igalia.com>
+
+        [GTK] Spreaker live shows won't play
+        https://bugs.webkit.org/show_bug.cgi?id=173306
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        This was due to removing the code that negotiated caps for Icecast
+        streams based on the response headers in r191947. The problem is that
+        the typefind element can sometimes squint hard enough and see an MP3
+        stream and attempt to play it, resulting in garbled audio playback. More
+        commonly typefind fails to recognize the Icecast stream and bails,
+        resulting in no playback at all.
+
+        r191947 also removed the emission of metadata into the pipeline. This
+        patch also leaves that out since we have no use for it within WebKit.
+
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (StreamingClient::handleResponseReceived):
+
 2017-06-22  Matt Lewis  <jlewis3@apple.com>
 

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

@@ -957 +957 @@
         gst_app_src_set_size(priv->appsrc, -1);
 
-    gst_app_src_set_caps(priv->appsrc, nullptr);
+    // Signal to downstream if this is an Icecast stream.
+    GRefPtr<GstCaps> caps;
+    String metadataIntervalAsString = response.httpHeaderField(HTTPHeaderName::IcyMetaInt);
+    if (!metadataIntervalAsString.isEmpty()) {
+        bool isMetadataIntervalParsed;
+        int metadataInterval = metadataIntervalAsString.toInt(&isMetadataIntervalParsed);
+        if (isMetadataIntervalParsed && metadataInterval > 0)
+            caps = adoptGRef(gst_caps_new_simple("application/x-icy", "metadata-interval", G_TYPE_INT, metadataInterval, nullptr));
+    }
+    gst_app_src_set_caps(priv->appsrc, caps.get());
 
     // Emit a GST_EVENT_CUSTOM_DOWNSTREAM_STICKY event to let GStreamer know about the HTTP headers sent and received.