| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/media/rtc_peer_connection_handler.h" | 5 #include "content/renderer/media/rtc_peer_connection_handler.h" |
| 6 | 6 |
| 7 #include <string.h> | 7 #include <string.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 &blink::WebMediaTrackConstraintSet::googEnableVideoSuspendBelowMinBitrate, | 294 &blink::WebMediaTrackConstraintSet::googEnableVideoSuspendBelowMinBitrate, |
| 295 &the_value)) { | 295 &the_value)) { |
| 296 configuration->set_suspend_below_min_bitrate(the_value); | 296 configuration->set_suspend_below_min_bitrate(the_value); |
| 297 } | 297 } |
| 298 | 298 |
| 299 if (!GetConstraintValueAsBoolean( | 299 if (!GetConstraintValueAsBoolean( |
| 300 constraints, &blink::WebMediaTrackConstraintSet::enableRtpDataChannels, | 300 constraints, &blink::WebMediaTrackConstraintSet::enableRtpDataChannels, |
| 301 &configuration->enable_rtp_data_channel)) { | 301 &configuration->enable_rtp_data_channel)) { |
| 302 configuration->enable_rtp_data_channel = false; | 302 configuration->enable_rtp_data_channel = false; |
| 303 } | 303 } |
| 304 // TODO: Special treatment for screencast min bitrate, since it's an integer. | 304 int rate; |
| 305 // if (FindConstraint(constraints, | 305 if (GetConstraintValueAsInteger( |
| 306 // MediaConstraintsInterface::kScreencastMinBitrate, | 306 constraints, |
| 307 // &configuration->screencast_min_bitrate, NULL)) { | 307 &blink::WebMediaTrackConstraintSet::googScreencastMinBitrate, |
| 308 // configuration->override_screencast_min_bitrate = true; | 308 &rate)) { |
| 309 // } | 309 configuration->screencast_min_bitrate = rtc::Optional<int>(rate); |
| 310 // Note: If an optional is not present, webrtc decides on its own | 310 } |
| 311 // what the value should be. | |
| 312 configuration->combined_audio_video_bwe = ConstraintToOptional( | 311 configuration->combined_audio_video_bwe = ConstraintToOptional( |
| 313 constraints, | 312 constraints, |
| 314 &blink::WebMediaTrackConstraintSet::googCombinedAudioVideoBwe); | 313 &blink::WebMediaTrackConstraintSet::googCombinedAudioVideoBwe); |
| 315 configuration->enable_dtls_srtp = ConstraintToOptional( | 314 configuration->enable_dtls_srtp = ConstraintToOptional( |
| 316 constraints, &blink::WebMediaTrackConstraintSet::enableDtlsSrtp); | 315 constraints, &blink::WebMediaTrackConstraintSet::enableDtlsSrtp); |
| 317 } | 316 } |
| 318 | 317 |
| 319 class SessionDescriptionRequestTracker { | 318 class SessionDescriptionRequestTracker { |
| 320 public: | 319 public: |
| 321 SessionDescriptionRequestTracker( | 320 SessionDescriptionRequestTracker( |
| (...skipping 1474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1796 } | 1795 } |
| 1797 | 1796 |
| 1798 void RTCPeerConnectionHandler::ResetUMAStats() { | 1797 void RTCPeerConnectionHandler::ResetUMAStats() { |
| 1799 DCHECK(thread_checker_.CalledOnValidThread()); | 1798 DCHECK(thread_checker_.CalledOnValidThread()); |
| 1800 num_local_candidates_ipv6_ = 0; | 1799 num_local_candidates_ipv6_ = 0; |
| 1801 num_local_candidates_ipv4_ = 0; | 1800 num_local_candidates_ipv4_ = 0; |
| 1802 ice_connection_checking_start_ = base::TimeTicks(); | 1801 ice_connection_checking_start_ = base::TimeTicks(); |
| 1803 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); | 1802 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); |
| 1804 } | 1803 } |
| 1805 } // namespace content | 1804 } // namespace content |
| OLD | NEW |