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 #include <functional> | 10 #include <functional> |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
171 fake_decoder_() { | 171 fake_decoder_() { |
172 test_->video_send_config_.rtp.ssrcs[0]++; | 172 test_->video_send_config_.rtp.ssrcs[0]++; |
173 test_->video_send_config_.encoder_settings.encoder = &fake_encoder_; | 173 test_->video_send_config_.encoder_settings.encoder = &fake_encoder_; |
174 send_stream_ = test_->sender_call_->CreateVideoSendStream( | 174 send_stream_ = test_->sender_call_->CreateVideoSendStream( |
175 test_->video_send_config_.Copy(), | 175 test_->video_send_config_.Copy(), |
176 test_->video_encoder_config_.Copy()); | 176 test_->video_encoder_config_.Copy()); |
177 RTC_DCHECK_EQ(1u, test_->video_encoder_config_.number_of_streams); | 177 RTC_DCHECK_EQ(1u, test_->video_encoder_config_.number_of_streams); |
178 frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create( | 178 frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create( |
179 kDefaultWidth, kDefaultHeight, kDefaultFramerate, | 179 kDefaultWidth, kDefaultHeight, kDefaultFramerate, |
180 Clock::GetRealTimeClock())); | 180 Clock::GetRealTimeClock())); |
181 send_stream_->SetSource(frame_generator_capturer_.get()); | 181 send_stream_->SetSource(frame_generator_capturer_.get(), false); |
kthelgason
2016/10/18 08:31:20
I personally really dislike boolean arguments like
perkj_webrtc
2016/10/26 16:40:16
ok- I agree, I added an enum that match the curren
| |
182 send_stream_->Start(); | 182 send_stream_->Start(); |
183 frame_generator_capturer_->Start(); | 183 frame_generator_capturer_->Start(); |
184 | 184 |
185 if (receive_audio) { | 185 if (receive_audio) { |
186 AudioReceiveStream::Config receive_config; | 186 AudioReceiveStream::Config receive_config; |
187 receive_config.rtp.remote_ssrc = test_->video_send_config_.rtp.ssrcs[0]; | 187 receive_config.rtp.remote_ssrc = test_->video_send_config_.rtp.ssrcs[0]; |
188 // Bogus non-default id to prevent hitting a RTC_DCHECK when creating | 188 // Bogus non-default id to prevent hitting a RTC_DCHECK when creating |
189 // the AudioReceiveStream. Every receive stream has to correspond to | 189 // the AudioReceiveStream. Every receive stream has to correspond to |
190 // an underlying channel id. | 190 // an underlying channel id. |
191 receive_config.voe_channel_id = 0; | 191 receive_config.voe_channel_id = 0; |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
323 RtpExtension(RtpExtension::kTimestampOffsetUri, kTOFExtensionId); | 323 RtpExtension(RtpExtension::kTimestampOffsetUri, kTOFExtensionId); |
324 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); | 324 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); |
325 receiver_log_.PushExpectedLogLine( | 325 receiver_log_.PushExpectedLogLine( |
326 "WrappingBitrateEstimator: Switching to transmission time offset RBE."); | 326 "WrappingBitrateEstimator: Switching to transmission time offset RBE."); |
327 streams_.push_back(new Stream(this, false)); | 327 streams_.push_back(new Stream(this, false)); |
328 streams_[0]->StopSending(); | 328 streams_[0]->StopSending(); |
329 streams_[1]->StopSending(); | 329 streams_[1]->StopSending(); |
330 EXPECT_TRUE(receiver_log_.Wait()); | 330 EXPECT_TRUE(receiver_log_.Wait()); |
331 } | 331 } |
332 } // namespace webrtc | 332 } // namespace webrtc |
OLD | NEW |