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 | 10 |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 RTC_DCHECK(num_audio_streams == 0 || voe_send_.channel_id >= 0); | 200 RTC_DCHECK(num_audio_streams == 0 || voe_send_.channel_id >= 0); |
201 if (num_video_streams > 0) { | 201 if (num_video_streams > 0) { |
202 video_send_config_ = VideoSendStream::Config(send_transport); | 202 video_send_config_ = VideoSendStream::Config(send_transport); |
203 video_send_config_.encoder_settings.encoder = &fake_encoder_; | 203 video_send_config_.encoder_settings.encoder = &fake_encoder_; |
204 video_send_config_.encoder_settings.payload_name = "FAKE"; | 204 video_send_config_.encoder_settings.payload_name = "FAKE"; |
205 video_send_config_.encoder_settings.payload_type = | 205 video_send_config_.encoder_settings.payload_type = |
206 kFakeVideoSendPayloadType; | 206 kFakeVideoSendPayloadType; |
207 video_send_config_.rtp.extensions.push_back( | 207 video_send_config_.rtp.extensions.push_back( |
208 RtpExtension(RtpExtension::kTransportSequenceNumberUri, | 208 RtpExtension(RtpExtension::kTransportSequenceNumberUri, |
209 kTransportSequenceNumberExtensionId)); | 209 kTransportSequenceNumberExtensionId)); |
| 210 video_send_config_.rtp.extensions.push_back(RtpExtension( |
| 211 RtpExtension::kVideoContentTypeUri, kVideoContentTypeExtensionId)); |
210 FillEncoderConfiguration(num_video_streams, &video_encoder_config_); | 212 FillEncoderConfiguration(num_video_streams, &video_encoder_config_); |
211 | 213 |
212 for (size_t i = 0; i < num_video_streams; ++i) | 214 for (size_t i = 0; i < num_video_streams; ++i) |
213 video_send_config_.rtp.ssrcs.push_back(kVideoSendSsrcs[i]); | 215 video_send_config_.rtp.ssrcs.push_back(kVideoSendSsrcs[i]); |
214 video_send_config_.rtp.extensions.push_back(RtpExtension( | 216 video_send_config_.rtp.extensions.push_back(RtpExtension( |
215 RtpExtension::kVideoRotationUri, kVideoRotationRtpExtensionId)); | 217 RtpExtension::kVideoRotationUri, kVideoRotationRtpExtensionId)); |
216 } | 218 } |
217 | 219 |
218 if (num_audio_streams > 0) { | 220 if (num_audio_streams > 0) { |
219 audio_send_config_ = AudioSendStream::Config(send_transport); | 221 audio_send_config_ = AudioSendStream::Config(send_transport); |
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
525 | 527 |
526 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { | 528 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { |
527 } | 529 } |
528 | 530 |
529 bool EndToEndTest::ShouldCreateReceivers() const { | 531 bool EndToEndTest::ShouldCreateReceivers() const { |
530 return true; | 532 return true; |
531 } | 533 } |
532 | 534 |
533 } // namespace test | 535 } // namespace test |
534 } // namespace webrtc | 536 } // namespace webrtc |
OLD | NEW |