Chromium Code Reviews| 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 197 test_->encoder_config_.streams[0].width, | 197 test_->encoder_config_.streams[0].width, |
| 198 test_->encoder_config_.streams[0].height, | 198 test_->encoder_config_.streams[0].height, |
| 199 30, | 199 30, |
| 200 Clock::GetRealTimeClock())); | 200 Clock::GetRealTimeClock())); |
| 201 send_stream_->Start(); | 201 send_stream_->Start(); |
| 202 frame_generator_capturer_->Start(); | 202 frame_generator_capturer_->Start(); |
| 203 | 203 |
| 204 if (receive_audio) { | 204 if (receive_audio) { |
| 205 AudioReceiveStream::Config receive_config; | 205 AudioReceiveStream::Config receive_config; |
| 206 receive_config.rtp.remote_ssrc = test_->send_config_.rtp.ssrcs[0]; | 206 receive_config.rtp.remote_ssrc = test_->send_config_.rtp.ssrcs[0]; |
| 207 // Bogus non-default id, every receive stream should correspond to an | |
| 208 // underlying channel. | |
|
hta-webrtc
2015/07/06 19:04:00
This comment is not clear. Under what conditions i
pbos-webrtc
2015/07/09 10:21:49
Rephrased as:
// Bogus non-default id to prevent
| |
| 209 receive_config.voe_channel_id = 0; | |
| 207 receive_config.rtp.extensions.push_back( | 210 receive_config.rtp.extensions.push_back( |
| 208 RtpExtension(RtpExtension::kAbsSendTime, kASTExtensionId)); | 211 RtpExtension(RtpExtension::kAbsSendTime, kASTExtensionId)); |
| 209 audio_receive_stream_ = test_->receiver_call_->CreateAudioReceiveStream( | 212 audio_receive_stream_ = test_->receiver_call_->CreateAudioReceiveStream( |
| 210 receive_config); | 213 receive_config); |
| 211 } else { | 214 } else { |
| 212 VideoReceiveStream::Decoder decoder; | 215 VideoReceiveStream::Decoder decoder; |
| 213 decoder.decoder = &fake_decoder_; | 216 decoder.decoder = &fake_decoder_; |
| 214 decoder.payload_type = | 217 decoder.payload_type = |
| 215 test_->send_config_.encoder_settings.payload_type; | 218 test_->send_config_.encoder_settings.payload_type; |
| 216 decoder.payload_name = | 219 decoder.payload_name = |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 370 receiver_trace_.PushExpectedLogLine( | 373 receiver_trace_.PushExpectedLogLine( |
| 371 "WrappingBitrateEstimator: Switching to transmission time offset RBE."); | 374 "WrappingBitrateEstimator: Switching to transmission time offset RBE."); |
| 372 receiver_trace_.PushExpectedLogLine( | 375 receiver_trace_.PushExpectedLogLine( |
| 373 "RemoteBitrateEstimatorFactory: Instantiating."); | 376 "RemoteBitrateEstimatorFactory: Instantiating."); |
| 374 streams_.push_back(new Stream(this, false)); | 377 streams_.push_back(new Stream(this, false)); |
| 375 streams_[0]->StopSending(); | 378 streams_[0]->StopSending(); |
| 376 streams_[1]->StopSending(); | 379 streams_[1]->StopSending(); |
| 377 EXPECT_EQ(kEventSignaled, receiver_trace_.Wait()); | 380 EXPECT_EQ(kEventSignaled, receiver_trace_.Wait()); |
| 378 } | 381 } |
| 379 } // namespace webrtc | 382 } // namespace webrtc |
| OLD | NEW |