<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[182715] releases/WebKitGTK/webkit-2.8/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/182715">182715</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-13 05:30:32 -0700 (Mon, 13 Apr 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/182534">r182534</a> - [GStreamer] compress property for the HTTP source element
https://bugs.webkit.org/show_bug.cgi?id=143518

Reviewed by Carlos Garcia Campos.

Added a compress property so the default behavior or not
requesting content encoded to the server can be overridden if
needed. This is useful for adaptive streaming playback.

* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcSetProperty):
(webKitWebSrcGetProperty):
(webKitWebSrcStart):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (182714 => 182715)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog        2015-04-13 12:24:32 UTC (rev 182714)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog        2015-04-13 12:30:32 UTC (rev 182715)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-04-08  Philippe Normand  &lt;pnormand@igalia.com&gt;
+
+        [GStreamer] compress property for the HTTP source element
+        https://bugs.webkit.org/show_bug.cgi?id=143518
+
+        Reviewed by Carlos Garcia Campos.
+
+        Added a compress property so the default behavior or not
+        requesting content encoded to the server can be overridden if
+        needed. This is useful for adaptive streaming playback.
+
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (webKitWebSrcSetProperty):
+        (webKitWebSrcGetProperty):
+        (webKitWebSrcStart):
+
</ins><span class="cx"> 2015-04-07  Philippe Normand  &lt;pnormand@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GStreamer] extra-headers and keep-alive properties for HTTP source element
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (182714 => 182715)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp        2015-04-13 12:24:32 UTC (rev 182714)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp        2015-04-13 12:30:32 UTC (rev 182715)
</span><span class="lines">@@ -112,6 +112,7 @@
</span><span class="cx">     gchar* uri;
</span><span class="cx">     bool keepAlive;
</span><span class="cx">     GUniquePtr&lt;GstStructure&gt; extraHeaders;
</span><ins>+    bool compress;
</ins><span class="cx"> 
</span><span class="cx">     WebCore::MediaPlayer* player;
</span><span class="cx"> 
</span><span class="lines">@@ -150,7 +151,8 @@
</span><span class="cx">     PROP_IRADIO_TITLE,
</span><span class="cx">     PROP_LOCATION,
</span><span class="cx">     PROP_KEEP_ALIVE,
</span><del>-    PROP_EXTRA_HEADERS
</del><ins>+    PROP_EXTRA_HEADERS,
+    PROP_COMPRESS
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> static GstStaticPadTemplate srcTemplate = GST_STATIC_PAD_TEMPLATE(&quot;src&quot;,
</span><span class="lines">@@ -256,6 +258,10 @@
</span><span class="cx">         g_param_spec_boxed(&quot;extra-headers&quot;, &quot;Extra Headers&quot;, &quot;Extra headers to append to the HTTP request&quot;,
</span><span class="cx">             GST_TYPE_STRUCTURE, static_cast&lt;GParamFlags&gt;(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
</span><span class="cx"> 
</span><ins>+    g_object_class_install_property(oklass, PROP_COMPRESS,
+        g_param_spec_boolean(&quot;compress&quot;, &quot;Compress&quot;, &quot;Allow compressed content encodings&quot;,
+            FALSE, static_cast&lt;GParamFlags&gt;(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
</ins><span class="cx">     eklass-&gt;change_state = webKitWebSrcChangeState;
</span><span class="cx"> 
</span><span class="cx">     g_type_class_add_private(klass, sizeof(WebKitWebSrcPrivate));
</span><span class="lines">@@ -349,6 +355,9 @@
</span><span class="cx">         src-&gt;priv-&gt;extraHeaders.reset(s ? gst_structure_copy(s) : nullptr);
</span><span class="cx">         break;
</span><span class="cx">     }
</span><ins>+    case PROP_COMPRESS:
+        src-&gt;priv-&gt;compress = g_value_get_boolean(value);
+        break;
</ins><span class="cx">     default:
</span><span class="cx">         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propID, pspec);
</span><span class="cx">         break;
</span><span class="lines">@@ -383,6 +392,9 @@
</span><span class="cx">     case PROP_EXTRA_HEADERS:
</span><span class="cx">         gst_value_set_structure(value, priv-&gt;extraHeaders.get());
</span><span class="cx">         break;
</span><ins>+    case PROP_COMPRESS:
+        g_value_set_boolean(value, priv-&gt;compress);
+        break;
</ins><span class="cx">     default:
</span><span class="cx">         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propID, pspec);
</span><span class="cx">         break;
</span><span class="lines">@@ -542,13 +554,17 @@
</span><span class="cx">         request.setHTTPReferrer(priv-&gt;player-&gt;referrer());
</span><span class="cx"> 
</span><span class="cx"> #if USE(SOUP)
</span><del>-    // Let's disable HTTP Accept-Encoding here as we don't want the received response to be
-    // encoded in any way as we need to rely on the proper size of the returned data on
</del><ins>+    // By default, HTTP Accept-Encoding is disabled here as we don't
+    // want the received response to be encoded in any way as we need
+    // to rely on the proper size of the returned data on
</ins><span class="cx">     // didReceiveResponse.
</span><span class="cx">     // If Accept-Encoding is used, the server may send the data in encoded format and
</span><span class="cx">     // request.expectedContentLength() will have the &quot;wrong&quot; size (the size of the
</span><span class="cx">     // compressed data), even though the data received in didReceiveData is uncompressed.
</span><del>-    request.setAcceptEncoding(false);
</del><ins>+    // This is however useful to enable for adaptive streaming
+    // scenarios, when the demuxer needs to download playlists.
+    if (!priv-&gt;compress)
+        request.setAcceptEncoding(false);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     // Let Apple web servers know we want to access their nice movie trailers.
</span></span></pre>
</div>
</div>

</body>
</html>