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 if (bundlePolicyString == "max-compat") { | 256 if (bundlePolicyString == "max-compat") { |
257 bundlePolicy = WebRTCBundlePolicy::kMaxCompat; | 257 bundlePolicy = WebRTCBundlePolicy::kMaxCompat; |
258 } else if (bundlePolicyString == "max-bundle") { | 258 } else if (bundlePolicyString == "max-bundle") { |
259 bundlePolicy = WebRTCBundlePolicy::kMaxBundle; | 259 bundlePolicy = WebRTCBundlePolicy::kMaxBundle; |
260 } else { | 260 } else { |
261 DCHECK_EQ(bundlePolicyString, "balanced"); | 261 DCHECK_EQ(bundlePolicyString, "balanced"); |
262 } | 262 } |
263 | 263 |
264 // For the histogram value of "WebRTC.PeerConnection.SelectedRtcpMuxPolicy". | 264 // For the histogram value of "WebRTC.PeerConnection.SelectedRtcpMuxPolicy". |
265 *selectedRtcpMuxPolicy = RtcpMuxPolicyDefault; | 265 *selectedRtcpMuxPolicy = RtcpMuxPolicyDefault; |
266 WebRTCRtcpMuxPolicy rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kNegotiate; | 266 WebRTCRtcpMuxPolicy rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kRequire; |
267 if (configuration.hasRtcpMuxPolicy()) { | 267 if (configuration.hasRtcpMuxPolicy()) { |
268 String rtcpMuxPolicyString = configuration.rtcpMuxPolicy(); | 268 String rtcpMuxPolicyString = configuration.rtcpMuxPolicy(); |
269 if (rtcpMuxPolicyString == "require") { | 269 if (rtcpMuxPolicyString == "require") { |
270 *selectedRtcpMuxPolicy = RtcpMuxPolicyRequire; | 270 *selectedRtcpMuxPolicy = RtcpMuxPolicyRequire; |
271 rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kRequire; | 271 rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kRequire; |
honghaiz3
2016/11/22 00:19:35
I think you need to move this line to the else cla
zhihuang1
2016/11/22 00:31:55
Ah, you are right. This is a silly mistake.
| |
272 } else { | 272 } else { |
273 DCHECK_EQ(rtcpMuxPolicyString, "negotiate"); | 273 DCHECK_EQ(rtcpMuxPolicyString, "negotiate"); |
274 *selectedRtcpMuxPolicy = RtcpMuxPolicyNegotiate; | 274 *selectedRtcpMuxPolicy = RtcpMuxPolicyNegotiate; |
275 } | 275 } |
276 } | 276 } |
277 | 277 |
278 WebRTCConfiguration webConfiguration; | 278 WebRTCConfiguration webConfiguration; |
279 webConfiguration.iceTransportPolicy = iceTransportPolicy; | 279 webConfiguration.iceTransportPolicy = iceTransportPolicy; |
280 webConfiguration.bundlePolicy = bundlePolicy; | 280 webConfiguration.bundlePolicy = bundlePolicy; |
281 webConfiguration.rtcpMuxPolicy = rtcpMuxPolicy; | 281 webConfiguration.rtcpMuxPolicy = rtcpMuxPolicy; |
(...skipping 1199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1481 DEFINE_TRACE(RTCPeerConnection) { | 1481 DEFINE_TRACE(RTCPeerConnection) { |
1482 visitor->trace(m_localStreams); | 1482 visitor->trace(m_localStreams); |
1483 visitor->trace(m_remoteStreams); | 1483 visitor->trace(m_remoteStreams); |
1484 visitor->trace(m_dispatchScheduledEventRunner); | 1484 visitor->trace(m_dispatchScheduledEventRunner); |
1485 visitor->trace(m_scheduledEvents); | 1485 visitor->trace(m_scheduledEvents); |
1486 EventTargetWithInlineData::trace(visitor); | 1486 EventTargetWithInlineData::trace(visitor); |
1487 ActiveDOMObject::trace(visitor); | 1487 ActiveDOMObject::trace(visitor); |
1488 } | 1488 } |
1489 | 1489 |
1490 } // namespace blink | 1490 } // namespace blink |
OLD | NEW |