Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Side by Side Diff: webrtc/test/call_test.cc

Issue 2377023002: Now pass ADM as a constructor argument to audio_state. (Closed)
Patch Set: Removed audio_transport() mock calls in tests. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 30 matching lines...) Expand all
41 41
42 void CallTest::RunBaseTest(BaseTest* test) { 42 void CallTest::RunBaseTest(BaseTest* test) {
43 num_video_streams_ = test->GetNumVideoStreams(); 43 num_video_streams_ = test->GetNumVideoStreams();
44 num_audio_streams_ = test->GetNumAudioStreams(); 44 num_audio_streams_ = test->GetNumAudioStreams();
45 RTC_DCHECK(num_video_streams_ > 0 || num_audio_streams_ > 0); 45 RTC_DCHECK(num_video_streams_ > 0 || num_audio_streams_ > 0);
46 Call::Config send_config(test->GetSenderCallConfig()); 46 Call::Config send_config(test->GetSenderCallConfig());
47 if (num_audio_streams_ > 0) { 47 if (num_audio_streams_ > 0) {
48 CreateVoiceEngines(); 48 CreateVoiceEngines();
49 AudioState::Config audio_state_config; 49 AudioState::Config audio_state_config;
50 audio_state_config.voice_engine = voe_send_.voice_engine; 50 audio_state_config.voice_engine = voe_send_.voice_engine;
51 send_config.audio_state = AudioState::Create(audio_state_config); 51 send_config.audio_state = AudioState::Create(audio_state_config, nullptr);
52 } 52 }
53 CreateSenderCall(send_config); 53 CreateSenderCall(send_config);
54 if (test->ShouldCreateReceivers()) { 54 if (test->ShouldCreateReceivers()) {
55 Call::Config recv_config(test->GetReceiverCallConfig()); 55 Call::Config recv_config(test->GetReceiverCallConfig());
56 if (num_audio_streams_ > 0) { 56 if (num_audio_streams_ > 0) {
57 AudioState::Config audio_state_config; 57 AudioState::Config audio_state_config;
58 audio_state_config.voice_engine = voe_recv_.voice_engine; 58 audio_state_config.voice_engine = voe_recv_.voice_engine;
59 recv_config.audio_state = AudioState::Create(audio_state_config); 59 recv_config.audio_state = AudioState::Create(audio_state_config, nullptr);
60 } 60 }
61 CreateReceiverCall(recv_config); 61 CreateReceiverCall(recv_config);
62 } 62 }
63 test->OnCallsCreated(sender_call_.get(), receiver_call_.get()); 63 test->OnCallsCreated(sender_call_.get(), receiver_call_.get());
64 receive_transport_.reset(test->CreateReceiveTransport()); 64 receive_transport_.reset(test->CreateReceiveTransport());
65 send_transport_.reset(test->CreateSendTransport(sender_call_.get())); 65 send_transport_.reset(test->CreateSendTransport(sender_call_.get()));
66 66
67 if (test->ShouldCreateReceivers()) { 67 if (test->ShouldCreateReceivers()) {
68 send_transport_->SetReceiver(receiver_call_->Receiver()); 68 send_transport_->SetReceiver(receiver_call_->Receiver());
69 receive_transport_->SetReceiver(sender_call_->Receiver()); 69 receive_transport_->SetReceiver(sender_call_->Receiver());
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 429
430 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { 430 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
431 } 431 }
432 432
433 bool EndToEndTest::ShouldCreateReceivers() const { 433 bool EndToEndTest::ShouldCreateReceivers() const {
434 return true; 434 return true;
435 } 435 }
436 436
437 } // namespace test 437 } // namespace test
438 } // namespace webrtc 438 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698