| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 590 LOG(LS_INFO) << "Allowing RTP data engine."; | 590 LOG(LS_INFO) << "Allowing RTP data engine."; |
| 591 data_channel_type_ = cricket::DCT_RTP; | 591 data_channel_type_ = cricket::DCT_RTP; |
| 592 } else { | 592 } else { |
| 593 // DTLS has to be enabled to use SCTP. | 593 // DTLS has to be enabled to use SCTP. |
| 594 if (!options.disable_sctp_data_channels && dtls_enabled_) { | 594 if (!options.disable_sctp_data_channels && dtls_enabled_) { |
| 595 LOG(LS_INFO) << "Allowing SCTP data engine."; | 595 LOG(LS_INFO) << "Allowing SCTP data engine."; |
| 596 data_channel_type_ = cricket::DCT_SCTP; | 596 data_channel_type_ = cricket::DCT_SCTP; |
| 597 } | 597 } |
| 598 } | 598 } |
| 599 | 599 |
| 600 // Find Suspend Below Min Bitrate constraint. | |
| 601 if (FindConstraint( | |
| 602 constraints, | |
| 603 MediaConstraintsInterface::kEnableVideoSuspendBelowMinBitrate, | |
| 604 &value, | |
| 605 NULL)) { | |
| 606 video_options_.suspend_below_min_bitrate = rtc::Optional<bool>(value); | |
| 607 } | |
| 608 | |
| 609 SetOptionFromOptionalConstraint(constraints, | 600 SetOptionFromOptionalConstraint(constraints, |
| 610 MediaConstraintsInterface::kScreencastMinBitrate, | 601 MediaConstraintsInterface::kScreencastMinBitrate, |
| 611 &video_options_.screencast_min_bitrate_kbps); | 602 &video_options_.screencast_min_bitrate_kbps); |
| 612 | 603 |
| 613 SetOptionFromOptionalConstraint(constraints, | 604 SetOptionFromOptionalConstraint(constraints, |
| 614 MediaConstraintsInterface::kCombinedAudioVideoBwe, | 605 MediaConstraintsInterface::kCombinedAudioVideoBwe, |
| 615 &audio_options_.combined_audio_video_bwe); | 606 &audio_options_.combined_audio_video_bwe); |
| 616 | 607 |
| 617 audio_options_.audio_jitter_buffer_max_packets = | 608 audio_options_.audio_jitter_buffer_max_packets = |
| 618 rtc::Optional<int>(rtc_configuration.audio_jitter_buffer_max_packets); | 609 rtc::Optional<int>(rtc_configuration.audio_jitter_buffer_max_packets); |
| (...skipping 1500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2119 } | 2110 } |
| 2120 } | 2111 } |
| 2121 | 2112 |
| 2122 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, | 2113 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, |
| 2123 const rtc::SentPacket& sent_packet) { | 2114 const rtc::SentPacket& sent_packet) { |
| 2124 RTC_DCHECK(worker_thread()->IsCurrent()); | 2115 RTC_DCHECK(worker_thread()->IsCurrent()); |
| 2125 media_controller_->call_w()->OnSentPacket(sent_packet); | 2116 media_controller_->call_w()->OnSentPacket(sent_packet); |
| 2126 } | 2117 } |
| 2127 | 2118 |
| 2128 } // namespace webrtc | 2119 } // namespace webrtc |
| OLD | NEW |