| Index: talk/app/webrtc/webrtcsession.cc
|
| diff --git a/talk/app/webrtc/webrtcsession.cc b/talk/app/webrtc/webrtcsession.cc
|
| index 5957cae8aeb2bd8211d80f6e74c4a06e45339689..447f398909d914f67da7f62ede3fb50077c1464e 100644
|
| --- a/talk/app/webrtc/webrtcsession.cc
|
| +++ b/talk/app/webrtc/webrtcsession.cc
|
| @@ -601,8 +601,7 @@ bool WebRtcSession::Initialize(
|
| const PeerConnectionInterface::RTCConfiguration& rtc_configuration) {
|
| bundle_policy_ = rtc_configuration.bundle_policy;
|
| rtcp_mux_policy_ = rtc_configuration.rtcp_mux_policy;
|
| - video_options_.disable_prerenderer_smoothing =
|
| - rtc::Optional<bool>(rtc_configuration.disable_prerenderer_smoothing);
|
| +
|
| transport_controller_->SetSslMaxProtocolVersion(options.ssl_max_version);
|
|
|
| // Obtain a certificate from RTCConfiguration if any were provided (optional).
|
| @@ -649,15 +648,6 @@ bool WebRtcSession::Initialize(
|
| }
|
| }
|
|
|
| - // Find DSCP constraint.
|
| - if (FindConstraint(
|
| - constraints,
|
| - MediaConstraintsInterface::kEnableDscp,
|
| - &value, NULL)) {
|
| - audio_options_.dscp = rtc::Optional<bool>(value);
|
| - video_options_.dscp = rtc::Optional<bool>(value);
|
| - }
|
| -
|
| // Find Suspend Below Min Bitrate constraint.
|
| if (FindConstraint(
|
| constraints,
|
| @@ -671,11 +661,6 @@ bool WebRtcSession::Initialize(
|
| MediaConstraintsInterface::kScreencastMinBitrate,
|
| &video_options_.screencast_min_bitrate_kbps);
|
|
|
| - // Find constraints for cpu overuse detection.
|
| - SetOptionFromOptionalConstraint(constraints,
|
| - MediaConstraintsInterface::kCpuOveruseDetection,
|
| - &video_options_.cpu_overuse_detection);
|
| -
|
| SetOptionFromOptionalConstraint(constraints,
|
| MediaConstraintsInterface::kCombinedAudioVideoBwe,
|
| &audio_options_.combined_audio_video_bwe);
|
|
|