<!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>[237804] trunk</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/237804">237804</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2018-11-05 08:08:12 -0800 (Mon, 05 Nov 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GStreamer][WebRTC] Error out when simulcast is activated
https://bugs.webkit.org/show_bug.cgi?id=190678

Patch by Thibault Saunier <tsaunier@igalia.com> on 2018-11-05
Reviewed by Philippe Normand.

Implementing it is not for now yet.
Source/WebCore:

Tests for simulcast have been disabled as they now fail (instead of crashing).

* platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp:
(WebCore::GStreamerVideoEncoder::InitEncode):

LayoutTests:

Tests for simulcast have been disabled as they now fail (instead of crashing).

* platform/gtk/TestExpectations:
* platform/wpe/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformwpeTestExpectations">trunk/LayoutTests/platform/wpe/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamlibwebrtcGStreamerVideoEncoderFactorycpp">trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (237803 => 237804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2018-11-05 16:07:40 UTC (rev 237803)
+++ trunk/LayoutTests/ChangeLog 2018-11-05 16:08:12 UTC (rev 237804)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2018-11-05  Thibault Saunier  <tsaunier@igalia.com>
+
+        [GStreamer][WebRTC] Error out when simulcast is activated
+        https://bugs.webkit.org/show_bug.cgi?id=190678
+
+        Reviewed by Philippe Normand.
+
+        Implementing it is not for now yet.
+        Tests for simulcast have been disabled as they now fail (instead of crashing).
+
+        * platform/gtk/TestExpectations:
+        * platform/wpe/TestExpectations:
+
</ins><span class="cx"> 2018-11-05  Zan Dobersek  <zdobersek@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed WPE gardening. Updating or adding various baselines. Also
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwpeTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wpe/TestExpectations (237803 => 237804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wpe/TestExpectations  2018-11-05 16:07:40 UTC (rev 237803)
+++ trunk/LayoutTests/platform/wpe/TestExpectations     2018-11-05 16:08:12 UTC (rev 237804)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> 
</span><span class="cx"> # The webrtc implementation is not fully completed yet
</span><ins>+webkit.org/b/187064 webrtc/simulcast-h264.html
</ins><span class="cx"> webkit.org/b/189567 webrtc/video-addLegacyTransceiver.html [ Failure ]
</span><span class="cx"> webkit.org/b/187064 webrtc/audio-peer-connection-g722.html
</span><span class="cx"> webkit.org/b/187064 webrtc/video-with-receiver.html
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (237803 => 237804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-11-05 16:07:40 UTC (rev 237803)
+++ trunk/Source/WebCore/ChangeLog      2018-11-05 16:08:12 UTC (rev 237804)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2018-11-05  Thibault Saunier  <tsaunier@igalia.com>
+
+        [GStreamer][WebRTC] Error out when simulcast is activated
+        https://bugs.webkit.org/show_bug.cgi?id=190678
+
+        Reviewed by Philippe Normand.
+
+        Implementing it is not for now yet.
+
+        Tests for simulcast have been disabled as they now fail (instead of crashing).
+
+        * platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp:
+        (WebCore::GStreamerVideoEncoder::InitEncode):
+
</ins><span class="cx"> 2018-11-05  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         RealtimeOutgoingAudioSource subclasses should observe its source when fully constructed
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamlibwebrtcGStreamerVideoEncoderFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp (237803 => 237804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp     2018-11-05 16:07:40 UTC (rev 237803)
+++ trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp        2018-11-05 16:08:12 UTC (rev 237804)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
</span><span class="cx"> #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
</span><span class="cx"> #include "webrtc/modules/video_coding/include/video_codec_interface.h"
</span><ins>+#include "webrtc/modules/video_coding/utility/simulcast_utility.h"
</ins><span class="cx"> 
</span><span class="cx"> #include <gst/app/gstappsink.h>
</span><span class="cx"> #include <gst/app/gstappsrc.h>
</span><span class="lines">@@ -106,6 +107,12 @@
</span><span class="cx">         g_return_val_if_fail(codecSettings, WEBRTC_VIDEO_CODEC_ERR_PARAMETER);
</span><span class="cx">         g_return_val_if_fail(codecSettings->codecType == CodecType(), WEBRTC_VIDEO_CODEC_ERR_PARAMETER);
</span><span class="cx"> 
</span><ins>+        if (webrtc::SimulcastUtility::NumberOfSimulcastStreams(*codecSettings) > 1) {
+            GST_ERROR("Simulcast not supported.");
+
+            return WEBRTC_VIDEO_CODEC_ERR_SIMULCAST_PARAMETERS_NOT_SUPPORTED;
+        }
+
</ins><span class="cx">         m_encodedFrame._size = codecSettings->width * codecSettings->height * 3;
</span><span class="cx">         m_encodedFrame._buffer = new uint8_t[m_encodedFrame._size];
</span><span class="cx">         m_encodedImageBuffer.reset(m_encodedFrame._buffer);
</span></span></pre>
</div>
</div>

</body>
</html>