| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 } else if (bundlePolicyString == "max-bundle") { | 256 } else if (bundlePolicyString == "max-bundle") { |
| 257 bundlePolicy = WebRTCBundlePolicy::kMaxBundle; | 257 bundlePolicy = WebRTCBundlePolicy::kMaxBundle; |
| 258 } else { | 258 } else { |
| 259 DCHECK_EQ(bundlePolicyString, "balanced"); | 259 DCHECK_EQ(bundlePolicyString, "balanced"); |
| 260 } | 260 } |
| 261 | 261 |
| 262 WebRTCRtcpMuxPolicy rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kRequire; | 262 WebRTCRtcpMuxPolicy rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kRequire; |
| 263 String rtcpMuxPolicyString = configuration.rtcpMuxPolicy(); | 263 String rtcpMuxPolicyString = configuration.rtcpMuxPolicy(); |
| 264 if (rtcpMuxPolicyString == "negotiate") { | 264 if (rtcpMuxPolicyString == "negotiate") { |
| 265 rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kNegotiate; | 265 rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kNegotiate; |
| 266 UseCounter::count(context, UseCounter::RtcpMuxPolicyNegotiate); |
| 266 } else { | 267 } else { |
| 267 DCHECK_EQ(rtcpMuxPolicyString, "require"); | 268 DCHECK_EQ(rtcpMuxPolicyString, "require"); |
| 268 } | 269 } |
| 269 WebRTCConfiguration webConfiguration; | 270 WebRTCConfiguration webConfiguration; |
| 270 webConfiguration.iceTransportPolicy = iceTransportPolicy; | 271 webConfiguration.iceTransportPolicy = iceTransportPolicy; |
| 271 webConfiguration.bundlePolicy = bundlePolicy; | 272 webConfiguration.bundlePolicy = bundlePolicy; |
| 272 webConfiguration.rtcpMuxPolicy = rtcpMuxPolicy; | 273 webConfiguration.rtcpMuxPolicy = rtcpMuxPolicy; |
| 273 | 274 |
| 274 if (configuration.hasIceServers()) { | 275 if (configuration.hasIceServers()) { |
| 275 Vector<WebRTCIceServer> iceServers; | 276 Vector<WebRTCIceServer> iceServers; |
| (...skipping 1206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1482 DEFINE_TRACE(RTCPeerConnection) { | 1483 DEFINE_TRACE(RTCPeerConnection) { |
| 1483 visitor->trace(m_localStreams); | 1484 visitor->trace(m_localStreams); |
| 1484 visitor->trace(m_remoteStreams); | 1485 visitor->trace(m_remoteStreams); |
| 1485 visitor->trace(m_dispatchScheduledEventRunner); | 1486 visitor->trace(m_dispatchScheduledEventRunner); |
| 1486 visitor->trace(m_scheduledEvents); | 1487 visitor->trace(m_scheduledEvents); |
| 1487 EventTargetWithInlineData::trace(visitor); | 1488 EventTargetWithInlineData::trace(visitor); |
| 1488 SuspendableObject::trace(visitor); | 1489 SuspendableObject::trace(visitor); |
| 1489 } | 1490 } |
| 1490 | 1491 |
| 1491 } // namespace blink | 1492 } // namespace blink |
| OLD | NEW |