| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 transport_cc = false; | 193 transport_cc = false; |
| 194 send_config->rtp.extensions.push_back( | 194 send_config->rtp.extensions.push_back( |
| 195 RtpExtension(extension_type_.c_str(), kAbsSendTimeExtensionId)); | 195 RtpExtension(extension_type_.c_str(), kAbsSendTimeExtensionId)); |
| 196 } else if (extension_type_ == RtpExtension::kTransportSequenceNumber) { | 196 } else if (extension_type_ == RtpExtension::kTransportSequenceNumber) { |
| 197 transport_cc = true; | 197 transport_cc = true; |
| 198 send_config->rtp.extensions.push_back(RtpExtension( | 198 send_config->rtp.extensions.push_back(RtpExtension( |
| 199 extension_type_.c_str(), kTransportSequenceNumberExtensionId)); | 199 extension_type_.c_str(), kTransportSequenceNumberExtensionId)); |
| 200 } | 200 } |
| 201 | 201 |
| 202 for (AudioReceiveStream::Config& recv_config : *receive_configs) { | 202 for (AudioReceiveStream::Config& recv_config : *receive_configs) { |
| 203 recv_config.combined_audio_video_bwe = true; | |
| 204 recv_config.rtp.transport_cc = transport_cc; | 203 recv_config.rtp.transport_cc = transport_cc; |
| 205 recv_config.rtp.extensions = send_config->rtp.extensions; | 204 recv_config.rtp.extensions = send_config->rtp.extensions; |
| 206 recv_config.rtp.remote_ssrc = send_config->rtp.ssrc; | 205 recv_config.rtp.remote_ssrc = send_config->rtp.ssrc; |
| 207 } | 206 } |
| 208 } | 207 } |
| 209 | 208 |
| 210 void RampUpTester::OnCallsCreated(Call* sender_call, Call* receiver_call) { | 209 void RampUpTester::OnCallsCreated(Call* sender_call, Call* receiver_call) { |
| 211 sender_call_ = sender_call; | 210 sender_call_ = sender_call; |
| 212 } | 211 } |
| 213 | 212 |
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 578 true); | 577 true); |
| 579 RunBaseTest(&test); | 578 RunBaseTest(&test); |
| 580 } | 579 } |
| 581 | 580 |
| 582 TEST_F(RampUpTest, TransportSequenceNumberSingleStreamWithHighStartBitrate) { | 581 TEST_F(RampUpTest, TransportSequenceNumberSingleStreamWithHighStartBitrate) { |
| 583 RampUpTester test(1, 0, 0.9 * kSingleStreamTargetBps, | 582 RampUpTester test(1, 0, 0.9 * kSingleStreamTargetBps, |
| 584 RtpExtension::kTransportSequenceNumber, false, false); | 583 RtpExtension::kTransportSequenceNumber, false, false); |
| 585 RunBaseTest(&test); | 584 RunBaseTest(&test); |
| 586 } | 585 } |
| 587 } // namespace webrtc | 586 } // namespace webrtc |
| OLD | NEW |