| Index: webrtc/test/call_test.cc
|
| diff --git a/webrtc/test/call_test.cc b/webrtc/test/call_test.cc
|
| index 638e70483a1bccaa48f775cffb1c88fc4096a51f..dd2cfb161c3158a4892e97ef21740b42f36702d3 100644
|
| --- a/webrtc/test/call_test.cc
|
| +++ b/webrtc/test/call_test.cc
|
| @@ -146,38 +146,6 @@ void CallTest::RunBaseTest(BaseTest* test) {
|
| test->OnTestFinished();
|
| }
|
|
|
| -void CallTest::Start() {
|
| - if (video_send_stream_)
|
| - video_send_stream_->Start();
|
| - for (VideoReceiveStream* video_recv_stream : video_receive_streams_)
|
| - video_recv_stream->Start();
|
| - if (audio_send_stream_) {
|
| - audio_send_stream_->Start();
|
| - }
|
| - for (AudioReceiveStream* audio_recv_stream : audio_receive_streams_)
|
| - audio_recv_stream->Start();
|
| - for (FlexfecReceiveStream* flexfec_recv_stream : flexfec_receive_streams_)
|
| - flexfec_recv_stream->Start();
|
| - if (frame_generator_capturer_.get() != NULL)
|
| - frame_generator_capturer_->Start();
|
| -}
|
| -
|
| -void CallTest::Stop() {
|
| - if (frame_generator_capturer_.get() != NULL)
|
| - frame_generator_capturer_->Stop();
|
| - for (FlexfecReceiveStream* flexfec_recv_stream : flexfec_receive_streams_)
|
| - flexfec_recv_stream->Stop();
|
| - for (AudioReceiveStream* audio_recv_stream : audio_receive_streams_)
|
| - audio_recv_stream->Stop();
|
| - if (audio_send_stream_) {
|
| - audio_send_stream_->Stop();
|
| - }
|
| - for (VideoReceiveStream* video_recv_stream : video_receive_streams_)
|
| - video_recv_stream->Stop();
|
| - if (video_send_stream_)
|
| - video_send_stream_->Stop();
|
| -}
|
| -
|
| void CallTest::CreateCalls(const Call::Config& sender_config,
|
| const Call::Config& receiver_config) {
|
| CreateSenderCall(sender_config);
|
| @@ -338,10 +306,6 @@ void CallTest::CreateVideoStreams() {
|
| }
|
| }
|
|
|
| -void CallTest::SetFakeVideoCaptureRotation(VideoRotation rotation) {
|
| - frame_generator_capturer_->SetFakeRotation(rotation);
|
| -}
|
| -
|
| void CallTest::CreateAudioStreams() {
|
| audio_send_stream_ = sender_call_->CreateAudioSendStream(audio_send_config_);
|
| for (size_t i = 0; i < audio_receive_configs_.size(); ++i) {
|
| @@ -358,6 +322,38 @@ void CallTest::CreateFlexfecStreams() {
|
| }
|
| }
|
|
|
| +void CallTest::Start() {
|
| + if (video_send_stream_)
|
| + video_send_stream_->Start();
|
| + for (VideoReceiveStream* video_recv_stream : video_receive_streams_)
|
| + video_recv_stream->Start();
|
| + if (audio_send_stream_) {
|
| + audio_send_stream_->Start();
|
| + }
|
| + for (AudioReceiveStream* audio_recv_stream : audio_receive_streams_)
|
| + audio_recv_stream->Start();
|
| + for (FlexfecReceiveStream* flexfec_recv_stream : flexfec_receive_streams_)
|
| + flexfec_recv_stream->Start();
|
| + if (frame_generator_capturer_.get() != NULL)
|
| + frame_generator_capturer_->Start();
|
| +}
|
| +
|
| +void CallTest::Stop() {
|
| + if (frame_generator_capturer_.get() != NULL)
|
| + frame_generator_capturer_->Stop();
|
| + for (FlexfecReceiveStream* flexfec_recv_stream : flexfec_receive_streams_)
|
| + flexfec_recv_stream->Stop();
|
| + for (AudioReceiveStream* audio_recv_stream : audio_receive_streams_)
|
| + audio_recv_stream->Stop();
|
| + if (audio_send_stream_) {
|
| + audio_send_stream_->Stop();
|
| + }
|
| + for (VideoReceiveStream* video_recv_stream : video_receive_streams_)
|
| + video_recv_stream->Stop();
|
| + if (video_send_stream_)
|
| + video_send_stream_->Stop();
|
| +}
|
| +
|
| void CallTest::DestroyStreams() {
|
| if (audio_send_stream_)
|
| sender_call_->DestroyAudioSendStream(audio_send_stream_);
|
| @@ -379,6 +375,10 @@ void CallTest::DestroyStreams() {
|
| allocated_decoders_.clear();
|
| }
|
|
|
| +void CallTest::SetFakeVideoCaptureRotation(VideoRotation rotation) {
|
| + frame_generator_capturer_->SetFakeRotation(rotation);
|
| +}
|
| +
|
| void CallTest::CreateVoiceEngines() {
|
| voe_send_.voice_engine = VoiceEngine::Create();
|
| voe_send_.base = VoEBase::GetInterface(voe_send_.voice_engine);
|
|
|