| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 "webrtc/base/checks.h" | 10 #include "webrtc/base/checks.h" |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 RTC_DCHECK(num_video_streams <= kNumSsrcs); | 177 RTC_DCHECK(num_video_streams <= kNumSsrcs); |
| 178 RTC_DCHECK_LE(num_audio_streams, 1u); | 178 RTC_DCHECK_LE(num_audio_streams, 1u); |
| 179 RTC_DCHECK(num_audio_streams == 0 || voe_send_.channel_id >= 0); | 179 RTC_DCHECK(num_audio_streams == 0 || voe_send_.channel_id >= 0); |
| 180 if (num_video_streams > 0) { | 180 if (num_video_streams > 0) { |
| 181 video_send_config_ = VideoSendStream::Config(send_transport); | 181 video_send_config_ = VideoSendStream::Config(send_transport); |
| 182 video_send_config_.encoder_settings.encoder = &fake_encoder_; | 182 video_send_config_.encoder_settings.encoder = &fake_encoder_; |
| 183 video_send_config_.encoder_settings.payload_name = "FAKE"; | 183 video_send_config_.encoder_settings.payload_name = "FAKE"; |
| 184 video_send_config_.encoder_settings.payload_type = | 184 video_send_config_.encoder_settings.payload_type = |
| 185 kFakeVideoSendPayloadType; | 185 kFakeVideoSendPayloadType; |
| 186 video_send_config_.rtp.extensions.push_back( | 186 video_send_config_.rtp.extensions.push_back( |
| 187 RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeExtensionId)); | 187 RtpExtension(RtpExtension::kAbsSendTimeUri, kAbsSendTimeExtensionId)); |
| 188 video_encoder_config_.streams = test::CreateVideoStreams(num_video_streams); | 188 video_encoder_config_.streams = test::CreateVideoStreams(num_video_streams); |
| 189 for (size_t i = 0; i < num_video_streams; ++i) | 189 for (size_t i = 0; i < num_video_streams; ++i) |
| 190 video_send_config_.rtp.ssrcs.push_back(kVideoSendSsrcs[i]); | 190 video_send_config_.rtp.ssrcs.push_back(kVideoSendSsrcs[i]); |
| 191 video_send_config_.rtp.extensions.push_back(RtpExtension( | 191 video_send_config_.rtp.extensions.push_back(RtpExtension( |
| 192 RtpExtension::kVideoRotation, kVideoRotationRtpExtensionId)); | 192 RtpExtension::kVideoRotationUri, kVideoRotationRtpExtensionId)); |
| 193 } | 193 } |
| 194 | 194 |
| 195 if (num_audio_streams > 0) { | 195 if (num_audio_streams > 0) { |
| 196 audio_send_config_ = AudioSendStream::Config(send_transport); | 196 audio_send_config_ = AudioSendStream::Config(send_transport); |
| 197 audio_send_config_.voe_channel_id = voe_send_.channel_id; | 197 audio_send_config_.voe_channel_id = voe_send_.channel_id; |
| 198 audio_send_config_.rtp.ssrc = kAudioSendSsrc; | 198 audio_send_config_.rtp.ssrc = kAudioSendSsrc; |
| 199 } | 199 } |
| 200 } | 200 } |
| 201 | 201 |
| 202 void CallTest::CreateMatchingReceiveConfigs(Transport* rtcp_send_transport) { | 202 void CallTest::CreateMatchingReceiveConfigs(Transport* rtcp_send_transport) { |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 | 425 |
| 426 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { | 426 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { |
| 427 } | 427 } |
| 428 | 428 |
| 429 bool EndToEndTest::ShouldCreateReceivers() const { | 429 bool EndToEndTest::ShouldCreateReceivers() const { |
| 430 return true; | 430 return true; |
| 431 } | 431 } |
| 432 | 432 |
| 433 } // namespace test | 433 } // namespace test |
| 434 } // namespace webrtc | 434 } // namespace webrtc |
| OLD | NEW |