OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 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 #include <stdio.h> | 10 #include <stdio.h> |
(...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
821 encoder_config_.streams = params_.ss.streams; | 821 encoder_config_.streams = params_.ss.streams; |
822 encoder_config_.spatial_layers = params_.ss.spatial_layers; | 822 encoder_config_.spatial_layers = params_.ss.spatial_layers; |
823 | 823 |
824 CreateMatchingReceiveConfigs(recv_transport); | 824 CreateMatchingReceiveConfigs(recv_transport); |
825 | 825 |
826 for (size_t i = 0; i < num_streams; ++i) { | 826 for (size_t i = 0; i < num_streams; ++i) { |
827 receive_configs_[i].rtp.nack.rtp_history_ms = kNackRtpHistoryMs; | 827 receive_configs_[i].rtp.nack.rtp_history_ms = kNackRtpHistoryMs; |
828 receive_configs_[i].rtp.rtx[kSendRtxPayloadType].ssrc = kSendRtxSsrcs[i]; | 828 receive_configs_[i].rtp.rtx[kSendRtxPayloadType].ssrc = kSendRtxSsrcs[i]; |
829 receive_configs_[i].rtp.rtx[kSendRtxPayloadType].payload_type = | 829 receive_configs_[i].rtp.rtx[kSendRtxPayloadType].payload_type = |
830 kSendRtxPayloadType; | 830 kSendRtxPayloadType; |
| 831 receive_configs_[i].rtp.transport_cc = params_.common.send_side_bwe; |
831 } | 832 } |
832 } | 833 } |
833 | 834 |
834 void VideoQualityTest::SetupScreenshare() { | 835 void VideoQualityTest::SetupScreenshare() { |
835 RTC_CHECK(params_.screenshare.enabled); | 836 RTC_CHECK(params_.screenshare.enabled); |
836 | 837 |
837 // Fill out codec settings. | 838 // Fill out codec settings. |
838 encoder_config_.content_type = VideoEncoderConfig::ContentType::kScreen; | 839 encoder_config_.content_type = VideoEncoderConfig::ContentType::kScreen; |
839 if (params_.common.codec == "VP8") { | 840 if (params_.common.codec == "VP8") { |
840 codec_settings_.VP8 = VideoEncoder::GetDefaultVp8Settings(); | 841 codec_settings_.VP8 = VideoEncoder::GetDefaultVp8Settings(); |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1063 send_stream_->Stop(); | 1064 send_stream_->Stop(); |
1064 receive_stream->Stop(); | 1065 receive_stream->Stop(); |
1065 | 1066 |
1066 call->DestroyVideoReceiveStream(receive_stream); | 1067 call->DestroyVideoReceiveStream(receive_stream); |
1067 call->DestroyVideoSendStream(send_stream_); | 1068 call->DestroyVideoSendStream(send_stream_); |
1068 | 1069 |
1069 transport.StopSending(); | 1070 transport.StopSending(); |
1070 } | 1071 } |
1071 | 1072 |
1072 } // namespace webrtc | 1073 } // namespace webrtc |
OLD | NEW |