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

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

Issue 1573453002: Add CreateSend/ReceiveTransport() methods to CallTest. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « webrtc/test/call_test.h ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 21 matching lines...) Expand all
32 audio_send_stream_(nullptr), 32 audio_send_stream_(nullptr),
33 fake_encoder_(clock_), 33 fake_encoder_(clock_),
34 num_video_streams_(0), 34 num_video_streams_(0),
35 num_audio_streams_(0), 35 num_audio_streams_(0),
36 fake_send_audio_device_(nullptr), 36 fake_send_audio_device_(nullptr),
37 fake_recv_audio_device_(nullptr) {} 37 fake_recv_audio_device_(nullptr) {}
38 38
39 CallTest::~CallTest() { 39 CallTest::~CallTest() {
40 } 40 }
41 41
42 void CallTest::RunBaseTest(BaseTest* test, 42 void CallTest::RunBaseTest(BaseTest* test) {
43 const FakeNetworkPipe::Config& config) {
44 num_video_streams_ = test->GetNumVideoStreams(); 43 num_video_streams_ = test->GetNumVideoStreams();
45 num_audio_streams_ = test->GetNumAudioStreams(); 44 num_audio_streams_ = test->GetNumAudioStreams();
46 RTC_DCHECK(num_video_streams_ > 0 || num_audio_streams_ > 0); 45 RTC_DCHECK(num_video_streams_ > 0 || num_audio_streams_ > 0);
47 Call::Config send_config(test->GetSenderCallConfig()); 46 Call::Config send_config(test->GetSenderCallConfig());
48 if (num_audio_streams_ > 0) { 47 if (num_audio_streams_ > 0) {
49 CreateVoiceEngines(); 48 CreateVoiceEngines();
50 AudioState::Config audio_state_config; 49 AudioState::Config audio_state_config;
51 audio_state_config.voice_engine = voe_send_.voice_engine; 50 audio_state_config.voice_engine = voe_send_.voice_engine;
52 send_config.audio_state = AudioState::Create(audio_state_config); 51 send_config.audio_state = AudioState::Create(audio_state_config);
53 } 52 }
54 CreateSenderCall(send_config); 53 CreateSenderCall(send_config);
55 if (test->ShouldCreateReceivers()) { 54 if (test->ShouldCreateReceivers()) {
56 Call::Config recv_config(test->GetReceiverCallConfig()); 55 Call::Config recv_config(test->GetReceiverCallConfig());
57 if (num_audio_streams_ > 0) { 56 if (num_audio_streams_ > 0) {
58 AudioState::Config audio_state_config; 57 AudioState::Config audio_state_config;
59 audio_state_config.voice_engine = voe_recv_.voice_engine; 58 audio_state_config.voice_engine = voe_recv_.voice_engine;
60 recv_config.audio_state = AudioState::Create(audio_state_config); 59 recv_config.audio_state = AudioState::Create(audio_state_config);
61 } 60 }
62 CreateReceiverCall(recv_config); 61 CreateReceiverCall(recv_config);
63 } 62 }
64 send_transport_.reset(new PacketTransport( 63 send_transport_.reset(test->CreateSendTransport(sender_call_.get()));
65 sender_call_.get(), test, test::PacketTransport::kSender, config)); 64 receive_transport_.reset(test->CreateReceiveTransport());
66 receive_transport_.reset(new PacketTransport(
67 nullptr, test, test::PacketTransport::kReceiver, config));
68 test->OnTransportsCreated(send_transport_.get(), receive_transport_.get());
69 test->OnCallsCreated(sender_call_.get(), receiver_call_.get()); 65 test->OnCallsCreated(sender_call_.get(), receiver_call_.get());
70 66
71 if (test->ShouldCreateReceivers()) { 67 if (test->ShouldCreateReceivers()) {
72 send_transport_->SetReceiver(receiver_call_->Receiver()); 68 send_transport_->SetReceiver(receiver_call_->Receiver());
73 receive_transport_->SetReceiver(sender_call_->Receiver()); 69 receive_transport_->SetReceiver(sender_call_->Receiver());
74 } else { 70 } else {
75 // Sender-only call delivers to itself. 71 // Sender-only call delivers to itself.
76 send_transport_->SetReceiver(sender_call_->Receiver()); 72 send_transport_->SetReceiver(sender_call_->Receiver());
77 receive_transport_->SetReceiver(nullptr); 73 receive_transport_->SetReceiver(nullptr);
78 } 74 }
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 return Call::Config(); 373 return Call::Config();
378 } 374 }
379 375
380 Call::Config BaseTest::GetReceiverCallConfig() { 376 Call::Config BaseTest::GetReceiverCallConfig() {
381 return Call::Config(); 377 return Call::Config();
382 } 378 }
383 379
384 void BaseTest::OnCallsCreated(Call* sender_call, Call* receiver_call) { 380 void BaseTest::OnCallsCreated(Call* sender_call, Call* receiver_call) {
385 } 381 }
386 382
387 void BaseTest::OnTransportsCreated(PacketTransport* send_transport, 383 test::PacketTransport* BaseTest::CreateSendTransport(Call* sender_call) {
388 PacketTransport* receive_transport) {} 384 return new PacketTransport(sender_call, this, test::PacketTransport::kSender,
385 FakeNetworkPipe::Config());
386 }
387
388 test::PacketTransport* BaseTest::CreateReceiveTransport() {
389 return new PacketTransport(nullptr, this, test::PacketTransport::kReceiver,
390 FakeNetworkPipe::Config());
391 }
389 392
390 size_t BaseTest::GetNumVideoStreams() const { 393 size_t BaseTest::GetNumVideoStreams() const {
391 return 1; 394 return 1;
392 } 395 }
393 396
394 size_t BaseTest::GetNumAudioStreams() const { 397 size_t BaseTest::GetNumAudioStreams() const {
395 return 0; 398 return 0;
396 } 399 }
397 400
398 void BaseTest::ModifyVideoConfigs( 401 void BaseTest::ModifyVideoConfigs(
(...skipping 26 matching lines...) Expand all
425 428
426 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { 429 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
427 } 430 }
428 431
429 bool EndToEndTest::ShouldCreateReceivers() const { 432 bool EndToEndTest::ShouldCreateReceivers() const {
430 return true; 433 return true;
431 } 434 }
432 435
433 } // namespace test 436 } // namespace test
434 } // namespace webrtc 437 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/test/call_test.h ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698