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 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 } else if (bundlePolicyString == "max-bundle") { | 257 } else if (bundlePolicyString == "max-bundle") { |
258 bundlePolicy = WebRTCBundlePolicy::kMaxBundle; | 258 bundlePolicy = WebRTCBundlePolicy::kMaxBundle; |
259 } else { | 259 } else { |
260 DCHECK_EQ(bundlePolicyString, "balanced"); | 260 DCHECK_EQ(bundlePolicyString, "balanced"); |
261 } | 261 } |
262 | 262 |
263 WebRTCRtcpMuxPolicy rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kRequire; | 263 WebRTCRtcpMuxPolicy rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kRequire; |
264 String rtcpMuxPolicyString = configuration.rtcpMuxPolicy(); | 264 String rtcpMuxPolicyString = configuration.rtcpMuxPolicy(); |
265 if (rtcpMuxPolicyString == "negotiate") { | 265 if (rtcpMuxPolicyString == "negotiate") { |
266 rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kNegotiate; | 266 rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kNegotiate; |
| 267 UseCounter::count(context, UseCounter::RtcpMuxPolicyNegotiate); |
267 } else { | 268 } else { |
268 DCHECK_EQ(rtcpMuxPolicyString, "require"); | 269 DCHECK_EQ(rtcpMuxPolicyString, "require"); |
269 } | 270 } |
270 WebRTCConfiguration webConfiguration; | 271 WebRTCConfiguration webConfiguration; |
271 webConfiguration.iceTransportPolicy = iceTransportPolicy; | 272 webConfiguration.iceTransportPolicy = iceTransportPolicy; |
272 webConfiguration.bundlePolicy = bundlePolicy; | 273 webConfiguration.bundlePolicy = bundlePolicy; |
273 webConfiguration.rtcpMuxPolicy = rtcpMuxPolicy; | 274 webConfiguration.rtcpMuxPolicy = rtcpMuxPolicy; |
274 | 275 |
275 if (configuration.hasIceServers()) { | 276 if (configuration.hasIceServers()) { |
276 Vector<WebRTCIceServer> iceServers; | 277 Vector<WebRTCIceServer> iceServers; |
(...skipping 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1493 DEFINE_TRACE(RTCPeerConnection) { | 1494 DEFINE_TRACE(RTCPeerConnection) { |
1494 visitor->trace(m_localStreams); | 1495 visitor->trace(m_localStreams); |
1495 visitor->trace(m_remoteStreams); | 1496 visitor->trace(m_remoteStreams); |
1496 visitor->trace(m_dispatchScheduledEventRunner); | 1497 visitor->trace(m_dispatchScheduledEventRunner); |
1497 visitor->trace(m_scheduledEvents); | 1498 visitor->trace(m_scheduledEvents); |
1498 EventTargetWithInlineData::trace(visitor); | 1499 EventTargetWithInlineData::trace(visitor); |
1499 SuspendableObject::trace(visitor); | 1500 SuspendableObject::trace(visitor); |
1500 } | 1501 } |
1501 | 1502 |
1502 } // namespace blink | 1503 } // namespace blink |
OLD | NEW |