Switch voice transport to use Call and Stream instead of VoENetwork.

webrtc/test/call_test.cc

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include "webrtc/base/checks.h"
 #include "webrtc/common.h"
 #include "webrtc/config.h"
 #include "webrtc/test/call_test.h"
 #include "webrtc/test/encoder_settings.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/voice_engine/include/voe_base.h"
 #include "webrtc/voice_engine/include/voe_codec.h"
-#include "webrtc/voice_engine/include/voe_network.h"
 
 namespace webrtc {
 namespace test {
 
 namespace {
 const int kVideoRotationRtpExtensionId = 4;
 }
 
 CallTest::CallTest()
     : clock_(Clock::GetRealTimeClock()),
@@ skipping 42 matching lines @@
     // Sender-only call delivers to itself.
     send_transport_->SetReceiver(sender_call_->Receiver());
     receive_transport_->SetReceiver(nullptr);
   }
 
   CreateSendConfig(num_video_streams_, num_audio_streams_,
                    send_transport_.get());
   if (test->ShouldCreateReceivers()) {
     CreateMatchingReceiveConfigs(receive_transport_.get());
   }
-  if (num_audio_streams_ > 0)
-    SetupVoiceEngineTransports(send_transport_.get(), receive_transport_.get());
-
   if (num_video_streams_ > 0) {
     test->ModifyVideoConfigs(&video_send_config_, &video_receive_configs_,
                              &video_encoder_config_);
   }
   if (num_audio_streams_ > 0)
     test->ModifyAudioConfigs(&audio_send_config_, &audio_receive_configs_);
 
   if (num_video_streams_ > 0) {
     CreateVideoStreams();
     test->OnVideoStreamsCreated(video_send_stream_, video_receive_streams_);
@@ skipping 209 matching lines @@
     receiver_call_->DestroyAudioReceiveStream(audio_recv_stream);
   video_receive_streams_.clear();
 
   allocated_decoders_.clear();
 }
 
 void CallTest::CreateVoiceEngines() {
   CreateFakeAudioDevices();
   voe_send_.voice_engine = VoiceEngine::Create();
   voe_send_.base = VoEBase::GetInterface(voe_send_.voice_engine);
-  voe_send_.network = VoENetwork::GetInterface(voe_send_.voice_engine);
   voe_send_.codec = VoECodec::GetInterface(voe_send_.voice_engine);
   EXPECT_EQ(0, voe_send_.base->Init(fake_send_audio_device_.get(), nullptr));
   Config voe_config;
   voe_config.Set<VoicePacing>(new VoicePacing(true));
   voe_send_.channel_id = voe_send_.base->CreateChannel(voe_config);
   EXPECT_GE(voe_send_.channel_id, 0);
 
   voe_recv_.voice_engine = VoiceEngine::Create();
   voe_recv_.base = VoEBase::GetInterface(voe_recv_.voice_engine);
-  voe_recv_.network = VoENetwork::GetInterface(voe_recv_.voice_engine);
   voe_recv_.codec = VoECodec::GetInterface(voe_recv_.voice_engine);
   EXPECT_EQ(0, voe_recv_.base->Init(fake_recv_audio_device_.get(), nullptr));
   voe_recv_.channel_id = voe_recv_.base->CreateChannel();
   EXPECT_GE(voe_recv_.channel_id, 0);
 }
 
-void CallTest::SetupVoiceEngineTransports(PacketTransport* send_transport,
-                                          PacketTransport* recv_transport) {
-  voe_send_.transport_adapter.reset(
-      new internal::TransportAdapter(send_transport));
-  voe_send_.transport_adapter->Enable();
-  EXPECT_EQ(0, voe_send_.network->RegisterExternalTransport(
-                   voe_send_.channel_id, *voe_send_.transport_adapter.get()));
-
-  voe_recv_.transport_adapter.reset(
-      new internal::TransportAdapter(recv_transport));
-  voe_recv_.transport_adapter->Enable();
-  EXPECT_EQ(0, voe_recv_.network->RegisterExternalTransport(
-                   voe_recv_.channel_id, *voe_recv_.transport_adapter.get()));
-}
-
 void CallTest::DestroyVoiceEngines() {
   voe_recv_.base->DeleteChannel(voe_recv_.channel_id);
   voe_recv_.channel_id = -1;
   voe_recv_.base->Release();
   voe_recv_.base = nullptr;
-  voe_recv_.network->Release();
-  voe_recv_.network = nullptr;
   voe_recv_.codec->Release();
   voe_recv_.codec = nullptr;
 
   voe_send_.base->DeleteChannel(voe_send_.channel_id);
   voe_send_.channel_id = -1;
   voe_send_.base->Release();
   voe_send_.base = nullptr;
-  voe_send_.network->Release();
-  voe_send_.network = nullptr;
   voe_send_.codec->Release();
   voe_send_.codec = nullptr;
 
   VoiceEngine::Delete(voe_send_.voice_engine);
   voe_send_.voice_engine = nullptr;
   VoiceEngine::Delete(voe_recv_.voice_engine);
   voe_recv_.voice_engine = nullptr;
 }
 
 const int CallTest::kDefaultTimeoutMs = 30 * 1000;
@@ skipping 79 matching lines @@
 
 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
 }
 
 bool EndToEndTest::ShouldCreateReceivers() const {
   return true;
 }
 
 }  // namespace test
 }  // namespace webrtc