<!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>[208942] trunk/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/208942">208942</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-21 01:29:22 -0800 (Mon, 21 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC][OpenWebRTC] RTP bundling support
https://bugs.webkit.org/show_bug.cgi?id=162333
Reviewed by Alejandro G. Castro.
Configure the OpenWebRTC transport agent bundle policy according
to the RTCConfiguration and pass the receive SSRCs over to
OpenWebRTC as well. Those are needed so the agent is aware of the
bundle layout.
* platform/mediastream/openwebrtc/MediaEndpointOwr.cpp:
(WebCore::MediaEndpointOwr::updateReceiveConfiguration):
(WebCore::MediaEndpointOwr::updateSendConfiguration):
(WebCore::MediaEndpointOwr::ensureTransportAgentAndTransceivers):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamopenwebrtcMediaEndpointOwrcpp">trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208941 => 208942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-21 09:24:45 UTC (rev 208941)
+++ trunk/Source/WebCore/ChangeLog 2016-11-21 09:29:22 UTC (rev 208942)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-11-21 Alejandro G. Castro <alex@igalia.com> and Philippe Normand <pnormand@igalia.com>
+
+ [WebRTC][OpenWebRTC] RTP bundling support
+ https://bugs.webkit.org/show_bug.cgi?id=162333
+
+ Reviewed by Alejandro G. Castro.
+
+ Configure the OpenWebRTC transport agent bundle policy according
+ to the RTCConfiguration and pass the receive SSRCs over to
+ OpenWebRTC as well. Those are needed so the agent is aware of the
+ bundle layout.
+
+ * platform/mediastream/openwebrtc/MediaEndpointOwr.cpp:
+ (WebCore::MediaEndpointOwr::updateReceiveConfiguration):
+ (WebCore::MediaEndpointOwr::updateSendConfiguration):
+ (WebCore::MediaEndpointOwr::ensureTransportAgentAndTransceivers):
+
</ins><span class="cx"> 2016-11-20 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [EncryptedMedia] Make EME API runtime-enabled
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamopenwebrtcMediaEndpointOwrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp (208941 => 208942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp 2016-11-21 09:24:45 UTC (rev 208941)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp 2016-11-21 09:29:22 UTC (rev 208942)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "MediaPayload.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "OpenWebRTCUtilities.h"
</span><ins>+#include "PeerConnectionStates.h"
</ins><span class="cx"> #include "RTCDataChannelHandler.h"
</span><span class="cx"> #include "RealtimeMediaSourceOwr.h"
</span><span class="cx"> #include <owr/owr.h>
</span><span class="lines">@@ -239,6 +240,7 @@
</span><span class="cx"> owr_transport_agent_add_session(m_transportAgent, session);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ owr_transport_agent_start(m_transportAgent);
</ins><span class="cx"> m_numberOfReceivePreparedSessions = m_transceivers.size();
</span><span class="cx">
</span><span class="cx"> return UpdateResult::Success;
</span><span class="lines">@@ -314,6 +316,14 @@
</span><span class="cx"> owr_media_session_set_send_payload(OWR_MEDIA_SESSION(session), sendPayload);
</span><span class="cx"> owr_media_session_set_send_source(OWR_MEDIA_SESSION(session), source->mediaSource());
</span><span class="cx">
</span><ins>+ // FIXME: Support for group-ssrc SDP line is missing.
+ const Vector<unsigned> receiveSsrcs = mdesc.ssrcs;
+ if (receiveSsrcs.size()) {
+ g_object_set(session, "receive-ssrc", receiveSsrcs[0], nullptr);
+ if (receiveSsrcs.size() == 2)
+ g_object_set(session, "receive-rtx-ssrc", receiveSsrcs[1], nullptr);
+ }
+
</ins><span class="cx"> m_numberOfSendPreparedSessions = i + 1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -559,8 +569,25 @@
</span><span class="cx"> ASSERT(m_dtlsCertificate);
</span><span class="cx">
</span><span class="cx"> if (!m_transportAgent) {
</span><del>- m_transportAgent = owr_transport_agent_new(false);
</del><ins>+ // FIXME: Handle SDP BUNDLE line from the remote source instead of falling back to balanced.
+ OwrBundlePolicyType bundlePolicy = OWR_BUNDLE_POLICY_TYPE_BALANCED;
</ins><span class="cx">
</span><ins>+ switch (m_configuration->bundlePolicy) {
+ case PeerConnectionStates::BundlePolicy::Balanced:
+ bundlePolicy = OWR_BUNDLE_POLICY_TYPE_BALANCED;
+ break;
+ case PeerConnectionStates::BundlePolicy::MaxCompat:
+ bundlePolicy = OWR_BUNDLE_POLICY_TYPE_MAX_COMPAT;
+ break;
+ case PeerConnectionStates::BundlePolicy::MaxBundle:
+ bundlePolicy = OWR_BUNDLE_POLICY_TYPE_MAX_BUNDLE;
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ };
+
+ m_transportAgent = owr_transport_agent_new(false, bundlePolicy);
+
</ins><span class="cx"> ASSERT(m_configuration);
</span><span class="cx"> for (auto& server : m_configuration->iceServers) {
</span><span class="cx"> for (auto& webkitUrl : server.urls) {
</span></span></pre>
</div>
</div>
</body>
</html>