Move the VoE tests to use external transport instead of the built in udp transport
Review URL: https://webrtc-codereview.appspot.com/1223006
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3708 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/tools/e2e_quality/audio/audio_e2e_harness.cc b/tools/e2e_quality/audio/audio_e2e_harness.cc
index 4e8f77c..4d44377 100644
--- a/tools/e2e_quality/audio/audio_e2e_harness.cc
+++ b/tools/e2e_quality/audio/audio_e2e_harness.cc
@@ -15,17 +15,20 @@
#include "gflags/gflags.h"
#include "gtest/gtest.h"
-#include "voice_engine/include/voe_audio_processing.h"
-#include "voice_engine/include/voe_base.h"
-#include "voice_engine/include/voe_codec.h"
-#include "voice_engine/include/voe_hardware.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/test/channel_transport/include/channel_transport.h"
+#include "webrtc/voice_engine/include/voe_audio_processing.h"
+#include "webrtc/voice_engine/include/voe_base.h"
+#include "webrtc/voice_engine/include/voe_codec.h"
+#include "webrtc/voice_engine/include/voe_hardware.h"
+#include "webrtc/voice_engine/include/voe_network.h"
DEFINE_string(render, "render", "render device name");
DEFINE_string(codec, "ISAC", "codec name");
DEFINE_int32(rate, 16000, "codec sample rate in Hz");
namespace webrtc {
-namespace {
+namespace test {
void RunHarness() {
VoiceEngine* voe = VoiceEngine::Create();
@@ -38,12 +41,18 @@
ASSERT_TRUE(codec != NULL);
VoEHardware* hardware = VoEHardware::GetInterface(voe);
ASSERT_TRUE(hardware != NULL);
+ VoENetwork* network = VoENetwork::GetInterface(voe);
+ ASSERT_TRUE(network != NULL);
ASSERT_EQ(0, base->Init());
int channel = base->CreateChannel();
ASSERT_NE(-1, channel);
- ASSERT_EQ(0, base->SetSendDestination(channel, 1234, "127.0.0.1"));
- ASSERT_EQ(0, base->SetLocalReceiver(channel, 1234));
+
+ scoped_ptr<VoiceChannelTransport> voice_channel_transport(
+ new VoiceChannelTransport(network, channel));
+
+ ASSERT_EQ(0, voice_channel_transport->SetSendDestination("127.0.0.1", 1234));
+ ASSERT_EQ(0, voice_channel_transport->SetLocalReceiver(1234));
CodecInst codec_params = {0};
bool codec_found = false;
@@ -90,10 +99,10 @@
}
}
-} // namespace
+} // namespace test
} // namespace webrtc
int main(int argc, char** argv) {
google::ParseCommandLineFlags(&argc, &argv, true);
- webrtc::RunHarness();
+ webrtc::test::RunHarness();
}
diff --git a/tools/e2e_quality/e2e_quality.gyp b/tools/e2e_quality/e2e_quality.gyp
index 250750e7..67c34ae 100644
--- a/tools/e2e_quality/e2e_quality.gyp
+++ b/tools/e2e_quality/e2e_quality.gyp
@@ -13,6 +13,7 @@
'target_name': 'audio_e2e_harness',
'type': 'executable',
'dependencies': [
+ '<(webrtc_root)/test/channel_transport.gyp:channel_transport',
'<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine_core',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/google-gflags/google-gflags.gyp:google-gflags',
diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h
index bbdd64d..c5f0500 100644
--- a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h
+++ b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h
@@ -13,9 +13,30 @@
#include "before_initialization_fixture.h"
#include "scoped_ptr.h"
+#include "webrtc/common_types.h"
class TestErrorObserver;
+class LoopBackTransport : public webrtc::Transport {
+ public:
+ LoopBackTransport(webrtc::VoENetwork* voe_network)
+ : voe_network_(voe_network) {
+ }
+
+ virtual int SendPacket(int channel, const void *data, int len) {
+ voe_network_->ReceivedRTPPacket(channel, data, len);
+ return len;
+ }
+
+ virtual int SendRTCPPacket(int channel, const void *data, int len) {
+ voe_network_->ReceivedRTCPPacket(channel, data, len);
+ return len;
+ }
+
+ private:
+ webrtc::VoENetwork* voe_network_;
+};
+
// This fixture initializes the voice engine in addition to the work
// done by the before-initialization fixture. It also registers an error
// observer which will fail tests on error callbacks. This fixture is
diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc b/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc
index d1e6039..353888a 100644
--- a/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc
+++ b/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc
@@ -12,8 +12,6 @@
#include <cstring>
-static const char* kLoopbackIp = "127.0.0.1";
-
AfterStreamingFixture::AfterStreamingFixture()
: channel_(voe_base_->CreateChannel()) {
EXPECT_GE(channel_, 0);
@@ -30,7 +28,9 @@
voe_file_->StopPlayingFileAsMicrophone(channel_);
PausePlaying();
+ EXPECT_EQ(0, voe_network_->DeRegisterExternalTransport(channel_));
voe_base_->DeleteChannel(channel_);
+ delete transport_;
}
void AfterStreamingFixture::SwitchToManualMicrophone() {
@@ -59,8 +59,8 @@
}
void AfterStreamingFixture::SetUpLocalPlayback() {
- EXPECT_EQ(0, voe_base_->SetSendDestination(channel_, 8000, kLoopbackIp));
- EXPECT_EQ(0, voe_base_->SetLocalReceiver(0, 8000));
+ transport_ = new LoopBackTransport(voe_network_);
+ EXPECT_EQ(0, voe_network_->RegisterExternalTransport(channel_, *transport_));
webrtc::CodecInst codec;
codec.channels = 1;
diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h b/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h
index 6b0a61f..26e37a7 100644
--- a/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h
+++ b/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h
@@ -42,6 +42,8 @@
private:
void SetUpLocalPlayback();
+
+ LoopBackTransport* transport_;
};
diff --git a/webrtc/voice_engine/test/auto_test/standard/network_test.cc b/webrtc/voice_engine/test/auto_test/standard/network_test.cc
index 8bf2d11..f4713dc 100644
--- a/webrtc/voice_engine/test/auto_test/standard/network_test.cc
+++ b/webrtc/voice_engine/test/auto_test/standard/network_test.cc
@@ -23,79 +23,6 @@
using ::testing::Between;
-TEST_F(NetworkTest, GetSourceInfoReturnsPortsAndIpAfterReceivingPackets) {
- // Give some time to send speech packets.
- Sleep(200);
-
- int rtp_port = 0;
- int rtcp_port = 0;
- char source_ip[32] = "127.0.0.1";
-
- EXPECT_EQ(0, voe_network_->GetSourceInfo(channel_, rtp_port, rtcp_port,
- source_ip));
-
- EXPECT_EQ(kDefaultRtpPort, rtp_port);
- EXPECT_EQ(kDefaultRtcpPort, rtcp_port);
-}
-
-TEST_F(NetworkTest, NoFilterIsEnabledByDefault) {
- int filter_rtp_port = -1;
- int filter_rtcp_port = -1;
- char filter_ip[64] = { 0 };
-
- EXPECT_EQ(0, voe_network_->GetSourceFilter(
- channel_, filter_rtp_port, filter_rtcp_port, filter_ip));
-
- EXPECT_EQ(0, filter_rtp_port);
- EXPECT_EQ(0, filter_rtcp_port);
- EXPECT_STREQ("", filter_ip);
-}
-
-TEST_F(NetworkTest, ManualCanFilterRtpPort) {
- TEST_LOG("No filter, should hear audio.\n");
- Sleep(1000);
-
- int port_to_block = kDefaultRtpPort + 10;
- EXPECT_EQ(0, voe_network_->SetSourceFilter(channel_, port_to_block));
-
- // Changes should take effect immediately.
- int filter_rtp_port = -1;
- int filter_rtcp_port = -1;
- char filter_ip[64] = { 0 };
-
- EXPECT_EQ(0, voe_network_->GetSourceFilter(
- channel_, filter_rtp_port, filter_rtcp_port, filter_ip));
-
- EXPECT_EQ(port_to_block, filter_rtp_port);
-
- TEST_LOG("Now filtering port %d, should not hear audio.\n", port_to_block);
- Sleep(1000);
-
- TEST_LOG("Removing filter, should hear audio.\n");
- EXPECT_EQ(0, voe_network_->SetSourceFilter(channel_, 0));
- Sleep(1000);
-}
-
-TEST_F(NetworkTest, ManualCanFilterIp) {
- TEST_LOG("You should hear audio.\n");
- Sleep(1000);
-
- int rtcp_port_to_block = kDefaultRtcpPort + 10;
- TEST_LOG("Filtering IP 10.10.10.10, should not hear audio.\n");
- EXPECT_EQ(0, voe_network_->SetSourceFilter(
- channel_, 0, rtcp_port_to_block, "10.10.10.10"));
-
- int filter_rtp_port = -1;
- int filter_rtcp_port = -1;
- char filter_ip[64] = { 0 };
- EXPECT_EQ(0, voe_network_->GetSourceFilter(
- channel_, filter_rtp_port, filter_rtcp_port, filter_ip));
-
- EXPECT_EQ(0, filter_rtp_port);
- EXPECT_EQ(rtcp_port_to_block, filter_rtcp_port);
- EXPECT_STREQ("10.10.10.10", filter_ip);
-}
-
TEST_F(NetworkTest,
CallsObserverOnTimeoutAndRestartWhenPacketTimeoutNotificationIsEnabled) {
// First, get rid of the default, asserting observer and install our observer.
diff --git a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
index 3549cb3..c0f1b95 100644
--- a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
+++ b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
@@ -101,10 +101,10 @@
second_channel_ = voe_base_->CreateChannel();
EXPECT_GE(second_channel_, 0);
- EXPECT_EQ(0, voe_base_->SetSendDestination(
- second_channel_, 8002, "127.0.0.1"));
- EXPECT_EQ(0, voe_base_->SetLocalReceiver(
- second_channel_, 8002));
+ transport_ = new LoopBackTransport(voe_network_);
+ EXPECT_EQ(0, voe_network_->RegisterExternalTransport(second_channel_,
+ *transport_));
+
EXPECT_EQ(0, voe_base_->StartReceive(second_channel_));
EXPECT_EQ(0, voe_base_->StartPlayout(second_channel_));
EXPECT_EQ(0, voe_rtp_rtcp_->SetLocalSSRC(second_channel_, 5678));
@@ -115,10 +115,13 @@
}
void TearDown() {
+ EXPECT_EQ(0, voe_network_->DeRegisterExternalTransport(second_channel_));
voe_base_->DeleteChannel(second_channel_);
+ delete transport_;
}
int second_channel_;
+ LoopBackTransport* transport_;
};
void RtcpAppHandler::OnApplicationDataReceived(
diff --git a/webrtc/voice_engine/test/auto_test/voe_cpu_test.cc b/webrtc/voice_engine/test/auto_test/voe_cpu_test.cc
index 14e4a00..45b1d7f 100644
--- a/webrtc/voice_engine/test/auto_test/voe_cpu_test.cc
+++ b/webrtc/voice_engine/test/auto_test/voe_cpu_test.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "voe_cpu_test.h"
+
#include <stdio.h>
#include <string.h>
#include <time.h>
@@ -16,9 +18,11 @@
#include <conio.h>
#endif
-#include "voe_cpu_test.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/test/channel_transport/include/channel_transport.h"
using namespace webrtc;
+using namespace test;
namespace voetest {
@@ -45,6 +49,7 @@
VoEFile* file = _mgr.FilePtr();
VoECodec* codec = _mgr.CodecPtr();
VoEAudioProcessing* apm = _mgr.APMPtr();
+ VoENetwork* voe_network = _mgr.NetworkPtr();
int channel(-1);
CodecInst isac;
@@ -59,8 +64,12 @@
CHECK(base->Init());
channel = base->CreateChannel();
- CHECK(base->SetLocalReceiver(channel, 5566));
- CHECK(base->SetSendDestination(channel, 5566, "127.0.0.1"));
+ scoped_ptr<VoiceChannelTransport> voice_socket_transport(
+ new VoiceChannelTransport(voe_network, channel));
+
+ CHECK(voice_socket_transport->SetSendDestination("127.0.0.1", 5566));
+ CHECK(voice_socket_transport->SetLocalReceiver(5566));
+
CHECK(codec->SetRecPayloadType(channel, isac));
CHECK(codec->SetSendCodec(channel, isac));
@@ -86,7 +95,6 @@
base->DeleteChannel(channel);
CHECK(base->Terminate());
-
return 0;
}
diff --git a/webrtc/voice_engine/test/auto_test/voe_extended_test.cc b/webrtc/voice_engine/test/auto_test/voe_extended_test.cc
index d4c49c4..0d5d5a6 100644
--- a/webrtc/voice_engine/test/auto_test/voe_extended_test.cc
+++ b/webrtc/voice_engine/test/auto_test/voe_extended_test.cc
@@ -8,27 +8,23 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "webrtc/voice_engine/test/auto_test/voe_extended_test.h"
+
#include <stdio.h>
#include <string.h>
#include <vector>
-#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
-#include "webrtc/system_wrappers/interface/event_wrapper.h"
-#include "webrtc/system_wrappers/interface/ref_count.h"
-#include "webrtc/system_wrappers/interface/sleep.h"
-#include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/voice_engine/voice_engine_defines.h"
-#include "webrtc/voice_engine/test/auto_test/voe_extended_test.h"
#if defined(_WIN32)
#include <conio.h>
-#include <winsock2.h>
#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
#include <netdb.h>
#endif
using namespace webrtc;
+using namespace test;
namespace voetest {
@@ -158,21 +154,6 @@
return len;
}
-XTransport::XTransport(VoENetwork* netw, VoEFile* file) :
- _netw(netw), _file(file) {
-}
-
-int XTransport::SendPacket(int channel, const void *data, int len) {
- // loopback
- // _netw->ReceivedRTPPacket(channel, data, len);
-
- return 0;
-}
-
-int XTransport::SendRTCPPacket(int, const void *, int) {
- return 0;
-}
-
// ----------------------------------------------------------------------------
// VoERTPObserver
// ----------------------------------------------------------------------------
@@ -255,8 +236,14 @@
_playing[channel] = false;
_sending[channel] = false;
- voe_base_->SetLocalReceiver(channel, rtpPort);
- voe_base_->SetSendDestination(channel, rtpPort, "127.0.0.1");
+ VoENetwork* voe_network = _mgr.NetworkPtr();
+
+ voice_channel_transports_[channel].reset(
+ new VoiceChannelTransport(voe_network, channel));
+
+ voice_channel_transports_[channel]->SetSendDestination("127.0.0.1", rtpPort);
+ voice_channel_transports_[channel]->SetLocalReceiver(rtpPort);
+
if (listen) {
_listening[channel] = true;
voe_base_->StartReceive(channel);
@@ -286,6 +273,7 @@
_sending[channel] = false;
voe_base_->StopSend(channel);
}
+ voice_channel_transports_[channel].reset(NULL);
}
void VoEExtendedTest::Play(int channel, unsigned int timeMillisec, bool addFileAsMicrophone,
@@ -333,7 +321,7 @@
// instance variable since it is required in order to appease the
// gods of darkness.
VoEBase* voe_base_ = _mgr.BasePtr();
- VoENetwork* netw = _mgr.NetworkPtr();
+ VoENetwork* voe_network = _mgr.NetworkPtr();
#ifdef _TEST_RTP_RTCP_
VoERTP_RTCP* rtp = _mgr.RTP_RTCPPtr();
#endif
@@ -555,305 +543,6 @@
ANL();
// ------------------------------------------------------------------------
- // >> SetLocalReceiver
- //
- // State: VE not initialized, no existing channels
- TEST_MUSTPASS(voe_base_->Init());
-
- int ch;
-
- TEST(SetLocalReceiver);
- ANL();
-
- // no channel created yet => should fail
- TEST_MUSTPASS(!voe_base_->SetLocalReceiver(0, 100));
- MARK();
- TEST_ERROR(VE_CHANNEL_NOT_VALID);
-
- ch = voe_base_->CreateChannel();
-
-#ifdef WEBRTC_IOS
- printf("\nNOTE: Local IP must be set in source code (line %d) \n",
- __LINE__ + 1);
- char* localIp = "127.0.0.1";
-#else
- char localIp[64] = { 0 };
- TEST_MUSTPASS(netw->GetLocalIP(localIp));
- MARK();
- // NOTE: This API is supported on Win, Mac and Linux and may fail or not
- // return local IP for other platforms.
-#endif
-
- // trivial invalid function calls
- TEST_MUSTPASS(!voe_base_->SetLocalReceiver(ch+1, 12345));
- MARK();
- TEST_ERROR(VE_CHANNEL_NOT_VALID);
- TEST_MUSTPASS(!voe_base_->SetLocalReceiver(ch, -1));
- MARK();
- TEST_ERROR(VE_INVALID_PORT_NMBR);
-
- // check conflict with ongoing receiving
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345));
- MARK();
- TEST_MUSTPASS(voe_base_->StartReceive(ch));
- TEST_MUSTPASS(!voe_base_->SetLocalReceiver(ch, 12345));
- MARK();
- TEST_ERROR(VE_ALREADY_LISTENING);
- TEST_MUSTPASS(voe_base_->StopReceive(ch));
-
- // check conflict with ongoing transmission
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 12345, "127.0.0.1"));
- TEST_MUSTPASS(voe_base_->StartSend(ch));
- TEST_MUSTPASS(!voe_base_->SetLocalReceiver(ch, 12345));
- MARK();
- TEST_ERROR(VE_ALREADY_SENDING);
- TEST_MUSTPASS(voe_base_->StopSend(ch));
-
- // valid function calls
- // Need to sleep between, otherwise it may fail for unknown reason
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345));
- MARK();
- SleepMs(100);
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345));
- MARK();
- SleepMs(100);
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345, kVoEDefault, localIp));
- MARK();
- SleepMs(100);
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345, kVoEDefault, NULL,
- "230.1.2.3"));
- MARK();
- SleepMs(100);
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345, kVoEDefault, localIp,
- "230.1.2.3"));
- MARK();
- SleepMs(100);
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345, 5555, NULL));
- MARK();
- SleepMs(100);
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345));
- MARK();
- SleepMs(100);
-
- // STATE: no media but sockets exists and are binded to 12345 and 12346
- // respectively
-
- // Add some dynamic tests as well:
-
- // ensure that last setting is used (cancels old settings)
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345));
- MARK();
- SleepMs(100);
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 44444));
- MARK();
- SleepMs(100);
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 54321));
- MARK();
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 54321, "127.0.0.1"));
- TEST_MUSTPASS(voe_base_->StartReceive(ch));
- TEST_MUSTPASS(voe_base_->StartSend(ch));
- Play(ch, 1000, true, true);
- TEST_MUSTPASS(voe_base_->StopSend(ch));
- TEST_MUSTPASS(voe_base_->StopReceive(ch));
-
- TEST_MUSTPASS(voe_base_->DeleteChannel(ch));
-
- ANL();
- AOK();
- ANL();
- ANL();
-
- // >> end of SetLocalReceiver
- // ------------------------------------------------------------------------
-
- // ------------------------------------------------------------------------
- // >> GetLocalReceiver
- //
- // State: VE initialized, no existing channels
- TEST(GetLocalReceiver);
- ANL();
-
- int port;
- char ipaddr[64];
- int RTCPport;
-
- ch = voe_base_->CreateChannel();
-
- // verify non-configured (blank) local receiver
- TEST_MUSTPASS(voe_base_->GetLocalReceiver(ch, port, RTCPport, ipaddr));
- MARK();
- TEST_MUSTPASS(port != 0);
- TEST_MUSTPASS(RTCPport != 0);
- TEST_MUSTPASS(strcmp(ipaddr, "") != 0);
-
- // check some trivial set/get combinations
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345))
- TEST_MUSTPASS(voe_base_->GetLocalReceiver(ch, port, RTCPport, ipaddr));
- MARK();
- TEST_MUSTPASS(port != 12345);
- TEST_MUSTPASS(RTCPport != 12346);
- TEST_MUSTPASS(strcmp(ipaddr, "0.0.0.0") != 0); // now binded to "any" IP
-
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345, 55555))
- TEST_MUSTPASS(voe_base_->GetLocalReceiver(ch, port, RTCPport, ipaddr));
- MARK();
- TEST_MUSTPASS(port != 12345);
- TEST_MUSTPASS(RTCPport != 55555);
- TEST_MUSTPASS(strcmp(ipaddr, "0.0.0.0") != 0);
-
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345, kVoEDefault, localIp))
- TEST_MUSTPASS(voe_base_->GetLocalReceiver(ch, port, RTCPport, ipaddr));
- MARK();
- TEST_MUSTPASS(port != 12345);
- TEST_MUSTPASS(RTCPport != 12346);
- TEST_MUSTPASS(strcmp(ipaddr, localIp) != 0);
-
- TEST_MUSTPASS(voe_base_->DeleteChannel(ch));
-
- ANL();
- AOK();
- ANL();
- ANL();
-
- // >> end of GetLocalReceiver
- // ------------------------------------------------------------------------
-
- // ------------------------------------------------------------------------
- // >> SetSendDestination
- //
- // State: VE initialized, no existing channels
- TEST(SetSendDestination);
- ANL();
-
- // call without existing channel
- TEST_MUSTPASS(!voe_base_->SetSendDestination(0, 12345, "127.0.0.1"));
- MARK();
- TEST_ERROR(VE_CHANNEL_NOT_VALID);
-
- ch = voe_base_->CreateChannel();
-
- // trivial fail tests
- TEST_MUSTPASS(!voe_base_->SetSendDestination(ch, 65536, "127.0.0.1"));
- MARK();
- TEST_ERROR(VE_INVALID_PORT_NMBR); // invalid RTP port
- TEST_MUSTPASS(!voe_base_->SetSendDestination(ch, 12345, "127.0.0.1", 65536));
- MARK();
- TEST_ERROR(VE_INVALID_PORT_NMBR); // invalid source port
- TEST_MUSTPASS(!voe_base_->SetSendDestination(ch, 12345, "127.0.0.1", kVoEDefault,
- 65536));
- MARK();
- TEST_ERROR(VE_INVALID_PORT_NMBR); // invalid RTCP port
- TEST_MUSTPASS(!voe_base_->SetSendDestination(ch, 12345, "127.0.0.300"));
- MARK();
- TEST_ERROR(VE_INVALID_IP_ADDRESS); // invalid IP address
-
- // sockets must be created first to support multi-cast (not required
- // otherwise)
- TEST_MUSTPASS(!voe_base_->SetSendDestination(ch, 55555, "230.0.0.1"));
- MARK();
- TEST_ERROR(VE_SOCKET_ERROR);
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 55555)); // create sockets
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 55555, "230.0.0.1"));
- MARK(); // should work now
-
- voe_base_->DeleteChannel(0);
- ch = voe_base_->CreateChannel();
-
- // STATE: one channel created, no sockets exist
-
- // valid function calls
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 33333, "127.0.0.1"));
- MARK();
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 33333, "127.0.0.1", 44444));
- MARK();
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 33333, "127.0.0.1", kVoEDefault,
- 55555));
- MARK();
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 33333, "127.0.0.1", 44444,
- 55555));
- MARK();
-
- voe_base_->DeleteChannel(0);
- ch = voe_base_->CreateChannel();
-
- // create receive sockets first and then an extra pair of send sockets
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 44444));
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 44444, "127.0.0.1", 11111));
- MARK(); // binds to 11111
-
- TEST_MUSTPASS(voe_base_->DeleteChannel(ch));
-
- ANL();
- AOK();
- ANL();
- ANL();
-
- // >> end of SetSendDestination
- // ------------------------------------------------------------------------
-
- // ------------------------------------------------------------------------
- // >> GetSendDestination
- //
- // State: VE initialized, no existing channels
- TEST(GetSendDestination);
- ANL();
-
- int sourcePort;
-
- ch = voe_base_->CreateChannel();
-
- // verify non-configured (blank) local receiver
- TEST_MUSTPASS(voe_base_->GetSendDestination(ch, port, ipaddr, sourcePort,
- RTCPport));
- MARK();
- TEST_MUSTPASS(port != 0);
- TEST_MUSTPASS(sourcePort != 0);
- TEST_MUSTPASS(RTCPport != 0);
- TEST_MUSTPASS(strcmp(ipaddr, "") != 0);
-
- // check some trivial set/get combinations
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 44444, "127.0.0.1"));
- TEST_MUSTPASS(voe_base_->GetSendDestination(ch, port, ipaddr, sourcePort,
- RTCPport));
- MARK();
- TEST_MUSTPASS(port != 44444);
- TEST_MUSTPASS(sourcePort != 0); // should be 0 since no local receiver has
- // NOT been defined yet
- TEST_MUSTPASS(RTCPport != 44445);
- TEST_MUSTPASS(strcmp(ipaddr, "127.0.0.1") != 0);
-
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 55555));
- TEST_MUSTPASS(voe_base_->GetSendDestination(ch, port, ipaddr, sourcePort,
- RTCPport));
- MARK();
- TEST_MUSTPASS(port != 44444);
- TEST_MUSTPASS(sourcePort != 55555); // should be equal to local port
- TEST_MUSTPASS(RTCPport != 44445);
- TEST_MUSTPASS(strcmp(ipaddr, "127.0.0.1") != 0);
-
- voe_base_->DeleteChannel(0);
- ch = voe_base_->CreateChannel();
-
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 44444, "127.0.0.1"));
- // NULL as IP-address input should work as well
- TEST_MUSTPASS(voe_base_->GetSendDestination(ch, port, NULL, sourcePort,
- RTCPport));
- MARK();
- TEST_MUSTPASS(port != 44444);
- TEST_MUSTPASS(sourcePort != 0);
- TEST_MUSTPASS(RTCPport != 44445);
-
- TEST_MUSTPASS(voe_base_->DeleteChannel(ch));
-
- ANL();
- AOK();
- ANL();
- ANL();
-
- // >> end of GetLocalReceiver
- // ------------------------------------------------------------------------
-
- // ------------------------------------------------------------------------
// >> StartReceive
// >> StopReceive
//
@@ -871,14 +560,14 @@
MARK();
TEST_ERROR(VE_CHANNEL_NOT_VALID);
- ch = voe_base_->CreateChannel();
+ int ch = voe_base_->CreateChannel();
- // sockets must be created first
+ // must register external transport first.
TEST_MUSTPASS(!voe_base_->StartReceive(0));
MARK();
- TEST_ERROR(VE_SOCKETS_NOT_INITED);
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 55555));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
+
+ ExtendedTestTransport* ptrTransport = new ExtendedTestTransport(voe_network);
+ TEST_MUSTPASS(voe_network ->RegisterExternalTransport(ch, *ptrTransport));
MARK(); // should work this time
// enable again (should work)
@@ -892,7 +581,6 @@
MARK();
// Verify in loopback
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 55555, "127.0.0.1"));
TEST_MUSTPASS(voe_base_->StartSend(ch));
Play(ch, 1000, true, true);
TEST_MUSTPASS(voe_base_->StopSend(ch));
@@ -900,16 +588,15 @@
MARK();
voe_base_->DeleteChannel(0);
+ delete ptrTransport;
ch = voe_base_->CreateChannel();
// Ensure that it is OK to add delay between SetLocalReceiver and StarListen
TEST_LOG("\nspeak after 2 seconds and ensure that no delay is added:\n");
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 55555));
Sleep(2000, true); // adding emulated delay here
TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 55555, "127.0.0.1"));
TEST_MUSTPASS(voe_base_->StartSend(ch));
Play(ch, 2000, true, true);
TEST_MUSTPASS(voe_base_->StopSend(ch));
@@ -922,23 +609,23 @@
for (i = 0; i < voe_base_->MaxNumOfChannels(); i++) {
ch = voe_base_->CreateChannel();
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 11111+2*i));
- TEST_MUSTPASS(voe_base_->StartReceive(ch));
MARK();
}
for (i = 0; i < voe_base_->MaxNumOfChannels(); i++) {
- TEST_MUSTPASS(voe_base_->StopReceive(i));
- MARK();
voe_base_->DeleteChannel(i);
+ MARK();
}
for (i = 0; i < voe_base_->MaxNumOfChannels(); i++) {
ch = voe_base_->CreateChannel();
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 11111+2*i));
+ ExtendedTestTransport* ptrTransport =
+ new ExtendedTestTransport(voe_network);
+ TEST_MUSTPASS(voe_network ->RegisterExternalTransport(ch, *ptrTransport));
TEST_MUSTPASS(voe_base_->StartReceive(ch));
MARK();
TEST_MUSTPASS(voe_base_->StopReceive(ch));
MARK();
voe_base_->DeleteChannel(ch);
+ delete ptrTransport;
}
ANL();
@@ -1033,25 +720,24 @@
MARK();
TEST_ERROR(VE_DESTINATION_NOT_INITED);
+
// initialize destination and try again (should work even without existing
// sockets)
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 33333, "127.0.0.1"));
+ ptrTransport = new ExtendedTestTransport(voe_network);
+ TEST_MUSTPASS(voe_network ->RegisterExternalTransport(ch, *ptrTransport));
TEST_MUSTPASS(voe_base_->StartSend(ch));
MARK();
SleepMs(100);
- // STATE: sockets should now have been created automatically at the first
- // transmitted packet should be binded to 33333 and "0.0.0.0"
TEST_MUSTPASS(voe_base_->StopSend(ch));
MARK();
voe_base_->DeleteChannel(ch);
+ delete ptrTransport;
ch = voe_base_->CreateChannel();
- // try loopback with unique send sockets (closed when channel is deleted or
- // new source is set)
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 33333));
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 33333, "127.0.0.1", 44444));
+ ptrTransport = new ExtendedTestTransport(voe_network);
+ TEST_MUSTPASS(voe_network ->RegisterExternalTransport(ch, *ptrTransport));
TEST_MUSTPASS(voe_base_->StartSend(ch));
MARK();
TEST_MUSTPASS(voe_base_->StartReceive(ch));
@@ -1061,31 +747,7 @@
TEST_MUSTPASS(voe_base_->StopReceive(ch));
voe_base_->DeleteChannel(ch);
- ANL();
- // Multi-channel tests
- for (i = 0; i < voe_base_->MaxNumOfChannels(); i++) {
- ch = voe_base_->CreateChannel();
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 33333 + 2*i));
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 33333 + 2*i, "127.0.0.1"));
- TEST_MUSTPASS(voe_base_->StartSend(ch));
- MARK();
- }
- for (i = 0; i < voe_base_->MaxNumOfChannels(); i++) {
- TEST_MUSTPASS(voe_base_->StopSend(i));
- MARK();
- voe_base_->DeleteChannel(i);
- }
- for (i = 0; i < voe_base_->MaxNumOfChannels(); i++) {
- ch = voe_base_->CreateChannel();
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 45633 + 2*i));
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 45633 + 2*i, "127.0.0.1"));
- TEST_MUSTPASS(voe_base_->StartSend(ch));
- MARK();
- TEST_MUSTPASS(voe_base_->StopSend(ch));
- MARK();
- voe_base_->DeleteChannel(ch);
- }
ANL();
AOK();
ANL();
@@ -1163,9 +825,11 @@
ch = voe_base_->CreateChannel();
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch , 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 12345, "127.0.0.1"));
+ scoped_ptr<VoiceChannelTransport> voice_channel_transport(
+ new VoiceChannelTransport(voe_network, ch));
+ voice_channel_transport->SetSendDestination("127.0.0.1", 12345);
+ voice_channel_transport->SetLocalReceiver(12345);
TEST_MUSTPASS(voe_base_->StartReceive(ch));
TEST_MUSTPASS(voe_base_->StartSend(ch));
TEST_MUSTPASS(voe_base_->StartPlayout(ch));
@@ -1206,9 +870,9 @@
#ifdef _TEST_RTP_RTCP_
TEST_MUSTPASS(rtp->SetRTCP_CNAME(ch, "Johnny"));
#endif
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345, 12349));
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 12345, "127.0.0.1", kVoEDefault,
- 12349));
+ voice_channel_transport.reset(new VoiceChannelTransport(voe_network, ch));
+ voice_channel_transport->SetSendDestination("127.0.0.1", 12345);
+ voice_channel_transport->SetLocalReceiver(12345);
TEST_MUSTPASS(voe_base_->StartReceive(ch));
TEST_MUSTPASS(voe_base_->StartSend(ch));
@@ -1226,18 +890,11 @@
TEST_MUSTPASS(rtp->GetRemoteRTCP_CNAME(ch, tmpStr));
TEST_MUSTPASS(_stricmp("Johnny", tmpStr));
#endif
- int rtpPort(0), rtcpPort(0);
- char ipAddr[64] = { 0 };
- TEST_MUSTPASS(netw->GetSourceInfo(ch, rtpPort, rtcpPort, ipAddr));
- TEST_MUSTPASS(12349 != rtcpPort);
TEST_MUSTPASS(voe_base_->StopSend(ch));
TEST_MUSTPASS(voe_base_->StopPlayout(ch));
TEST_MUSTPASS(voe_base_->StopReceive(ch));
// Call StartSend before StartReceive
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 12345, "127.0.0.1"));
-
TEST_MUSTPASS(voe_base_->StartSend(ch));
TEST_MUSTPASS(voe_base_->StartReceive(ch));
TEST_MUSTPASS(voe_base_->StartPlayout(ch));
@@ -1251,9 +908,6 @@
TEST_MUSTPASS(voe_base_->StopReceive(ch));
// Try again using same ports
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 12345, "127.0.0.1"));
-
TEST_MUSTPASS(voe_base_->StartSend(ch));
TEST_MUSTPASS(voe_base_->StartReceive(ch));
TEST_MUSTPASS(voe_base_->StartPlayout(ch));
@@ -1264,38 +918,17 @@
SleepMs(7000); // Make sure we get RTCP packet
PAUSE
- // Verify correct RTCP source port
- TEST_MUSTPASS(netw->GetSourceInfo(ch, rtpPort, rtcpPort, ipAddr));
- TEST_MUSTPASS(12345+1 != rtcpPort);
TEST_MUSTPASS(voe_base_->StopSend(ch));
TEST_MUSTPASS(voe_base_->StopPlayout(ch));
TEST_MUSTPASS(voe_base_->StopReceive(ch));
voe_base_->DeleteChannel(ch);
+
ch = voe_base_->CreateChannel();
+ voice_channel_transport.reset(new VoiceChannelTransport(voe_network, ch));
- // Try with extra send socket
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch , 22222));
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 22222, "127.0.0.1", 11111));
-
- TEST_MUSTPASS(voe_base_->StartReceive(ch));
- TEST_MUSTPASS(voe_base_->StartSend(ch));
- TEST_MUSTPASS(voe_base_->StartPlayout(ch));
-
- TEST_LOG("\nfull duplex is now activated (4)\n");
-
- PAUSE
-
- TEST_MUSTPASS(voe_base_->StopSend(ch));
- TEST_MUSTPASS(voe_base_->StopPlayout(ch));
- TEST_MUSTPASS(voe_base_->StopReceive(ch));
-
- // repeat default case starting with a fresh channel
-
- voe_base_->DeleteChannel(ch);
- ch = voe_base_->CreateChannel();
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch , 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 12345, "127.0.0.1"));
+ voice_channel_transport->SetSendDestination("127.0.0.1", 12345);
+ voice_channel_transport->SetLocalReceiver(12345);
TEST_MUSTPASS(voe_base_->StartReceive(ch));
TEST_MUSTPASS(voe_base_->StartSend(ch));
@@ -1310,7 +943,6 @@
TEST_MUSTPASS(voe_base_->StopReceive(ch));
// restart call again
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 12345));
TEST_MUSTPASS(voe_base_->StartReceive(ch));
TEST_MUSTPASS(voe_base_->StartPlayout(ch));
TEST_MUSTPASS(voe_base_->StartSend(ch));
@@ -1323,34 +955,14 @@
TEST_MUSTPASS(voe_base_->StopPlayout(ch));
TEST_MUSTPASS(voe_base_->StopReceive(ch));
- // force sending from new socket
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch , 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 12345, "127.0.0.1", 12350,
- 12359));
- TEST_MUSTPASS(voe_base_->StartReceive(ch));
- TEST_MUSTPASS(voe_base_->StartPlayout(ch));
- TEST_MUSTPASS(voe_base_->StartSend(ch));
- TEST_LOG("\nfull duplex is now activated (7)\n");
-
- PAUSE
-
- // Test getting send settings
- TEST_MUSTPASS(voe_base_->GetSendDestination(ch, rtpPort, ipAddr, sourcePort,
- rtcpPort));
- TEST_MUSTPASS(12345 != rtpPort);
- TEST_MUSTPASS(_stricmp("127.0.0.1", ipAddr));
- TEST_MUSTPASS(12350 != sourcePort);
- TEST_MUSTPASS(12359 != rtcpPort);
-
- TEST_MUSTPASS(voe_base_->StopSend(ch));
- TEST_MUSTPASS(voe_base_->StopPlayout(ch));
- TEST_MUSTPASS(voe_base_->StopReceive(ch));
-
// new channel and new port
ch = voe_base_->CreateChannel();
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch , 33221));
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 33221, "127.0.0.1"));
+ scoped_ptr<VoiceChannelTransport> voice_channel_transport_2(
+ new VoiceChannelTransport(voe_network, ch));
+
+ voice_channel_transport_2->SetSendDestination("127.0.0.1", 33221);
+ voice_channel_transport_2->SetLocalReceiver(33221);
TEST_MUSTPASS(voe_base_->StartReceive(ch));
TEST_MUSTPASS(voe_base_->StartPlayout(ch));
@@ -1360,36 +972,6 @@
PAUSE
- TEST_MUSTPASS(voe_base_->StopSend(ch));
- TEST_MUSTPASS(voe_base_->StopPlayout(ch));
- TEST_MUSTPASS(voe_base_->StopReceive(ch));
-
- voe_base_->DeleteChannel(ch);
- ch = voe_base_->CreateChannel();
-
-#ifndef WEBRTC_IOS
- // bind to local IP and try again
- strcpy(localIp, "127.0.0.1");
-#else
- localIp = "127.0.0.1";
-#endif
-
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(ch, 33221, 12349, localIp));
- TEST_MUSTPASS(voe_base_->SetSendDestination(ch, 33221, localIp));
-
- TEST_MUSTPASS(voe_base_->StartReceive(ch));
- TEST_MUSTPASS(voe_base_->StartPlayout(ch));
- TEST_MUSTPASS(voe_base_->StartSend(ch));
-
- TEST_LOG("\nfull duplex is now activated (9)\n");
-
- PAUSE
-
- TEST_MUSTPASS(voe_base_->GetLocalReceiver(ch, rtpPort, rtcpPort, ipAddr));
- TEST_MUSTPASS(33221 != rtpPort);
- TEST_MUSTPASS(_stricmp(localIp, ipAddr));
- TEST_MUSTPASS(12349 != rtcpPort);
-
ANL();
AOK();
ANL();
@@ -1477,7 +1059,6 @@
voe_base_->DeleteChannel(0);
TEST_MUSTPASS(voe_base_->Terminate());
-
return 0;
}
@@ -1491,7 +1072,7 @@
VoECallReport* report = _mgr.CallReportPtr();
VoEFile* file = _mgr.FilePtr();
VoEAudioProcessing* apm = _mgr.APMPtr();
- VoENetwork* netw = _mgr.NetworkPtr();
+ VoENetwork* voe_network = _mgr.NetworkPtr();
PrepareTest("CallReport");
@@ -1516,8 +1097,10 @@
TEST_MUSTPASS(voe_base_->Init());
TEST_MUSTPASS(voe_base_->CreateChannel());
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, "127.0.0.1"));
+ scoped_ptr<VoiceChannelTransport> voice_channel_transport(
+ new VoiceChannelTransport(voe_network, 0));
+ voice_channel_transport->SetSendDestination("127.0.0.1", 12345);
+ voice_channel_transport->SetLocalReceiver(12345);
TEST_MUSTPASS(voe_base_->StartReceive(0));
TEST_MUSTPASS(voe_base_->StartSend(0));
TEST_MUSTPASS(voe_base_->StartPlayout(0));
@@ -1581,14 +1164,14 @@
// All results should be -1 since dead-or-alive is not active
TEST_MUSTPASS(report->GetDeadOrAliveSummary(0, nDead, nAlive) != -1);
MARK();
- TEST_MUSTPASS(netw->SetPeriodicDeadOrAliveStatus(0, true, 1));
+ TEST_MUSTPASS(voe_network ->SetPeriodicDeadOrAliveStatus(0, true, 1));
SleepMs(2000);
// All results should be >= 0 since dead-or-alive is active
TEST_MUSTPASS(report->GetDeadOrAliveSummary(0, nDead, nAlive));
MARK();
TEST_MUSTPASS(nDead == -1);
TEST_MUSTPASS(nAlive == -1)
- TEST_MUSTPASS(netw->SetPeriodicDeadOrAliveStatus(0, false));
+ TEST_MUSTPASS(voe_network ->SetPeriodicDeadOrAliveStatus(0, false));
AOK();
ANL();
@@ -1641,6 +1224,7 @@
VoEBase* voe_base_ = _mgr.BasePtr();
VoECodec* codec = _mgr.CodecPtr();
VoEFile* file = _mgr.FilePtr();
+ VoENetwork* voe_network = _mgr.NetworkPtr();
#ifdef _USE_EXTENDED_TRACE_
TEST_MUSTPASS(VoiceEngine::SetTraceFile(
@@ -1657,14 +1241,8 @@
TEST_MUSTPASS(voe_base_->Init());
TEST_MUSTPASS(voe_base_->CreateChannel());
-#ifdef WEBRTC_EXTERNAL_TRANSPORT
- ExtendedTestTransport* ptrTransport(NULL);
- ptrTransport = new ExtendedTestTransport(netw);
- TEST_MUSTPASS(netw->RegisterExternalTransport(0, *ptrTransport));
-#else
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, "127.0.0.1"));
-#endif
+ ExtendedTestTransport* ptrTransport = new ExtendedTestTransport(voe_network);
+ TEST_MUSTPASS(voe_network ->RegisterExternalTransport(0, *ptrTransport));
TEST_MUSTPASS(voe_base_->StartReceive(0));
TEST_MUSTPASS(voe_base_->StartSend(0));
TEST_MUSTPASS(voe_base_->StartPlayout(0));
@@ -2140,10 +1718,6 @@
TEST_MUSTPASS(voe_base_->StopReceive(0));
// start loopback streaming (PCMU is default)
-#ifndef WEBRTC_EXTERNAL_TRANSPORT
- TEST_MUSTPASS(voe_base_->SetSendDestination(0,8000,"127.0.0.1"));
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0,8000));
-#endif
TEST_MUSTPASS(voe_base_->StartReceive(0));
TEST_MUSTPASS(voe_base_->StartPlayout(0));
TEST_MUSTPASS(voe_base_->StartSend(0));
@@ -2416,16 +1990,10 @@
TEST(SetRecPayloadType - removing receive codecs);
ANL();
-#ifndef WEBRTC_EXTERNAL_TRANSPORT
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 8000, "127.0.0.1"));
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 8000));
-#endif
TEST_MUSTPASS(voe_base_->StartSend(0));
if (file) {
- TEST_MUSTPASS(file->StartPlayingFileAsMicrophone(0,
- _mgr.AudioFilename(),
- true,
- true));
+ TEST_MUSTPASS(file->StartPlayingFileAsMicrophone(
+ 0, _mgr.AudioFilename(), true, true));
}
// Scan all supported and valid codecs and remove from receiving db, then
@@ -2940,12 +2508,7 @@
// set iSAC as sending codec
// set iSAC-wb as sending codec
-#ifdef WEBRTC_EXTERNAL_TRANSPORT
- TEST_MUSTPASS(netw->RegisterExternalTransport(0, *ptrTransport));
-#else
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 8001, "127.0.0.1"));
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 8001));
-#endif
+ TEST_MUSTPASS(voe_network ->RegisterExternalTransport(0, *ptrTransport));
TEST_MUSTPASS(voe_base_->StartPlayout(0));
TEST_MUSTPASS(voe_base_->StartSend(0));
TEST_MUSTPASS(voe_base_->StartReceive(0));
@@ -2991,10 +2554,8 @@
TEST_LOG("Skipping extended iSAC API tests - "
"WEBRTC_CODEC_ISAC not defined\n");
#endif // #if defined(WEBRTC_CODEC_ISAC)
-#ifdef WEBRTC_EXTERNAL_TRANSPORT
- TEST_MUSTPASS(netw->DeRegisterExternalTransport(0));
+ TEST_MUSTPASS(voe_network ->DeRegisterExternalTransport(0));
delete ptrTransport;
-#endif
TEST_MUSTPASS(voe_base_->DeleteChannel(0));
TEST_MUSTPASS(voe_base_->Terminate());
@@ -3013,6 +2574,7 @@
VoEDtmf* dtmf = _mgr.DtmfPtr();
VoECodec* codec = _mgr.CodecPtr();
VoEVolumeControl* volume = _mgr.VolumeControlPtr();
+ VoENetwork* voe_network = _mgr.NetworkPtr();
std::string output_path = webrtc::test::OutputPath();
TEST_MUSTPASS(VoiceEngine::SetTraceFile(
@@ -3028,8 +2590,10 @@
//#endif
TEST_MUSTPASS(voe_base_->Init());
TEST_MUSTPASS(voe_base_->CreateChannel());
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, "127.0.0.1"));
+ scoped_ptr<VoiceChannelTransport> voice_channel_transport(
+ new VoiceChannelTransport(voe_network, 0));
+ voice_channel_transport->SetSendDestination("127.0.0.1", 12345);
+ voice_channel_transport->SetLocalReceiver(12345);
TEST_MUSTPASS(voe_base_->StartReceive(0));
TEST_MUSTPASS(voe_base_->StartSend(0));
TEST_MUSTPASS(voe_base_->StartPlayout(0));
@@ -3339,6 +2903,7 @@
VoEBase* voe_base_ = _mgr.BasePtr();
VoEFile* file = _mgr.FilePtr();
VoEEncryption* encrypt = _mgr.EncryptionPtr();
+ VoENetwork* voe_network = _mgr.NetworkPtr();
#ifdef _USE_EXTENDED_TRACE_
TEST_MUSTPASS(VoiceEngine::SetTraceFile(
@@ -3354,8 +2919,10 @@
#endif
TEST_MUSTPASS(voe_base_->Init());
TEST_MUSTPASS(voe_base_->CreateChannel());
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, "127.0.0.1"));
+ scoped_ptr<VoiceChannelTransport> voice_channel_transport(
+ new VoiceChannelTransport(voe_network, 0));
+ voice_channel_transport->SetSendDestination("127.0.0.1", 12345);
+ voice_channel_transport->SetLocalReceiver(12345);
TEST_MUSTPASS(voe_base_->StartReceive(0));
TEST_MUSTPASS(voe_base_->StartSend(0));
TEST_MUSTPASS(voe_base_->StartPlayout(0));
@@ -3850,6 +3417,7 @@
VoEBase* voe_base_ = _mgr.BasePtr();
VoEExternalMedia* xmedia = _mgr.ExternalMediaPtr();
+ VoENetwork* voe_network = _mgr.NetworkPtr();
// check if this interface is supported
if (!xmedia) {
@@ -3867,8 +3435,10 @@
#endif
TEST_MUSTPASS(voe_base_->Init());
TEST_MUSTPASS(voe_base_->CreateChannel());
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, "127.0.0.1"));
+ scoped_ptr<VoiceChannelTransport> voice_channel_transport(
+ new VoiceChannelTransport(voe_network, 0));
+ voice_channel_transport->SetSendDestination("127.0.0.1", 12345);
+ voice_channel_transport->SetLocalReceiver(12345);
TEST_MUSTPASS(voe_base_->StartReceive(0));
TEST_MUSTPASS(voe_base_->StartPlayout(0));
TEST_MUSTPASS(voe_base_->StartSend(0));
@@ -3973,6 +3543,7 @@
VoEBase* voe_base_ = _mgr.BasePtr();
VoEFile* file = _mgr.FilePtr();
VoECodec* codec = _mgr.CodecPtr();
+ VoENetwork* voe_network = _mgr.NetworkPtr();
#ifdef _USE_EXTENDED_TRACE_
TEST_MUSTPASS(VoiceEngine::SetTraceFile(
@@ -3989,8 +3560,10 @@
TEST_MUSTPASS(voe_base_->Init());
TEST_MUSTPASS(voe_base_->CreateChannel());
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, "127.0.0.1"));
+ scoped_ptr<VoiceChannelTransport> voice_channel_transport(
+ new VoiceChannelTransport(voe_network, 0));
+ voice_channel_transport->SetSendDestination("127.0.0.1", 12345);
+ voice_channel_transport->SetLocalReceiver(12345);
TEST_MUSTPASS(voe_base_->StartReceive(0));
TEST_MUSTPASS(voe_base_->StartPlayout(0));
TEST_MUSTPASS(voe_base_->StartSend(0));
@@ -4389,9 +3962,10 @@
TEST_MUSTPASS(ch == -1);
TEST_MUSTPASS(voe_base_->StopPlayout(ch));
}
-
- TEST_MUSTPASS(voe_base_->SetSendDestination(1, 12356, "127.0.0.1"));
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(1, 12356));
+ scoped_ptr<VoiceChannelTransport> voice_channel_transport_1(
+ new VoiceChannelTransport(voe_network, 1));
+ voice_channel_transport_1->SetSendDestination("127.0.0.1", 12356);
+ voice_channel_transport_1->SetLocalReceiver(12356);
TEST_MUSTPASS(voe_base_->StartReceive(1));
TEST_MUSTPASS(voe_base_->StopPlayout(1));
TEST_MUSTPASS(voe_base_->StartSend(1));
@@ -4978,20 +4552,8 @@
int VoEExtendedTest::TestNetwork() {
PrepareTest("Network");
-#ifdef WEBRTC_ANDROID
- int sleepTime = 200;
- int sleepTime2 = 250;
-#elif defined(WEBRTC_IOS) // WEBRTC_IOS needs more delay for getSourceInfo()
- int sleepTime = 150;
- int sleepTime2 = 200;
-#else
- int sleepTime = 100;
- int sleepTime2 = 200;
-#endif
-
VoEBase* voe_base_ = _mgr.BasePtr();
- VoEFile* file = _mgr.FilePtr();
- VoENetwork* netw = _mgr.NetworkPtr();
+ VoENetwork* voe_network = _mgr.NetworkPtr();
#ifdef _USE_EXTENDED_TRACE_
TEST_MUSTPASS(VoiceEngine::SetTraceFile((output_path +
@@ -5009,259 +4571,6 @@
TEST_MUSTPASS(voe_base_->Init());
// ------------------------------------------------------------------------
- // >> GetLocalIP
- //
- // State: VE initialized, no existing channels
- TEST(GetLocalIP);
- ANL();
-
-#ifdef WEBRTC_IOS
- // Should fail
- TEST_MUSTPASS(!netw->GetLocalIP(NULL, 0)); MARK();
- TEST_ERROR(VE_FUNC_NOT_SUPPORTED);
-
- ANL();
- printf("NOTE: Local IP must be set in source code (line %d) \n",
- __LINE__ + 1);
- const char* localIP = "192.168.1.4";
-
-#else
- // Must be big enough so that we can print an IPv6 address.
- char localIP[256] = {0};
-
- // invalid parameter
- TEST_MUSTPASS(!netw->GetLocalIP(NULL));
- MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
-
- // default function calls (IPv4)
- TEST_MUSTPASS(netw->GetLocalIP(localIP));
- MARK();
- TEST_LOG("[local IPv4: %s]\n", localIP);
- TEST_MUSTPASS(netw->GetLocalIP(localIP));
- MARK();
-
-#if !defined(WEBRTC_MAC) && !defined(WEBRTC_ANDROID)
- // default function calls (IPv6)
- TEST_MUSTPASS(netw->GetLocalIP(localIP, true));
- MARK();
- TEST_LOG("[local IPv6: %s]\n", localIP);
- TEST_MUSTPASS(netw->GetLocalIP(localIP, true));
- MARK();
-#endif
-
- // one last call to ensure that local
- TEST_MUSTPASS(netw->GetLocalIP(localIP));
- MARK();
-#endif
-
- ANL();
- AOK();
- ANL();
- ANL();
-
- // >> end of GetLocalIP
- // ------------------------------------------------------------------------
-
- // ------------------------------------------------------------------------
- // >> GetSourceInfo
- //
- // - VE initialized
- // - no existing channels
- TEST(GetSourceInfo);
- ANL();
-
- int rtpPort(0);
- int rtcpPort(0);
- char ipaddr[64] = { 0 };
- ExtendedTestTransport* ptrTransport(NULL);
-
- // call without valid channel
- TEST_MUSTPASS(!netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_ERROR(VE_CHANNEL_NOT_VALID);
-
- TEST_MUSTPASS(voe_base_->CreateChannel());
-
- // NULL as input string
- TEST_MUSTPASS(!netw->GetSourceInfo(0, rtpPort, rtcpPort, NULL));
- MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
-
- // call when external transport is enabled
- ptrTransport = new ExtendedTestTransport(netw);
- TEST_MUSTPASS(netw->RegisterExternalTransport(0, *ptrTransport));
- TEST_MUSTPASS(!netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_ERROR(VE_EXTERNAL_TRANSPORT_ENABLED);
- delete ptrTransport;
-
- // call when external transport is disabled (no packet received yet)
- TEST_MUSTPASS(netw->DeRegisterExternalTransport(0));
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtpPort != 0);
- TEST_MUSTPASS(rtcpPort != 0);
- TEST_MUSTPASS(strcmp(ipaddr, "") != 0);
- // send and receive packets with default settings for a while
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 8000));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 8000, "127.0.0.1"));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- SleepMs(sleepTime2); // does not guarantee RTCP
-
- // verify remote parameters (exclude RTCP)
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtpPort != 8000);
- TEST_MUSTPASS(strcmp(ipaddr, "127.0.0.1") != 0);
-
- // ensure that valid results are maintained after StopListen
- TEST_MUSTPASS(voe_base_->StopReceive(0));
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtpPort != 8000);
- TEST_MUSTPASS(strcmp(ipaddr, "127.0.0.1") != 0);
-
- // verify that results are maintained after new call to SetLocalReceiver
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 8000));
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtpPort != 8000);
- TEST_MUSTPASS(strcmp(ipaddr, "127.0.0.1") != 0);
-
- // STATE: not listening, not sending
- // send and receive packets with other settings for a while
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 9005));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 9005, "127.0.0.1"));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- SleepMs(sleepTime);
-
- // STATE: listening, sending
-
- // verify new remote parameters
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtpPort != 9005);
- TEST_MUSTPASS(strcmp(ipaddr, "127.0.0.1") != 0);
-
- // restart sending to and from local IP
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(voe_base_->StopReceive(0));
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 9005, kVoEDefault, localIP));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 9005, localIP));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- SleepMs(sleepTime);
-
- // verify new remote parameters
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtpPort != 9005);
- TEST_MUSTPASS(strcmp(ipaddr, localIP) != 0); // should not be "127.0.0.1"
-
- // use non-default source port in outgoing packets
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(voe_base_->StopReceive(0));
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 9005));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 9005, "127.0.0.1", 9010));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- SleepMs(sleepTime);
-
- // verify new remote parameters
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtpPort != 9010);
- TEST_MUSTPASS(strcmp(ipaddr, "127.0.0.1") != 0);
-
- // STATE: listening and sending using an extra local socket
-
- // stop/start sending
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- SleepMs(sleepTime);
-
- // verify that the unique source port is maintained for the extra socket
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtpPort != 9010);
- TEST_MUSTPASS(strcmp(ipaddr, "127.0.0.1") != 0);
-
- // set new source port for outgoing packets (9010 -> 9020)
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 9005, "127.0.0.1", 9020));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- SleepMs(sleepTime);
-#ifdef WEBRTC_IOS
- SleepMs(500); // Need extra pause for some reason
-#endif
-
- // verify that the unique source port is set for the new extra socket
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtpPort != 9020);
- // STATE: listening and sending using an extra local socket
-
- // remove extra send socket and restart call again
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(voe_base_->StopReceive(0));
- TEST_MUSTPASS(voe_base_->DeleteChannel(0)); // delete channel => destroys the
- // extra socket
- TEST_MUSTPASS(voe_base_->CreateChannel()); // new channel uses one socket only
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 8000)); // use new port as well
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 8000, "127.0.0.1"));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- SleepMs(sleepTime);
-
- // verify that remote info is correct
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtpPort != 8000);
- TEST_MUSTPASS(strcmp(ipaddr, "127.0.0.1") != 0);
-
- // STATE: listening and sending using shared socket
-
- // use non-default source port in outgoing packets to create extra send
- // socket
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(voe_base_->StopReceive(0));
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 7000));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 7000, "127.0.0.1", 7010));
- // RTP src is 7010 => RTCP src = 7011
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- SleepMs(sleepTime);
- // verify new remote parameters
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtpPort != 7010);
- TEST_MUSTPASS(strcmp(ipaddr, "127.0.0.1") != 0);
-
- // check RTCP port as well (should be 7010 + 1 = 7011)
- Sleep(8000, true);
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtpPort != 7010);
- TEST_MUSTPASS(rtcpPort != 7011);
- TEST_MUSTPASS(strcmp(ipaddr, "127.0.0.1") != 0);
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(voe_base_->StopReceive(0));
-
- TEST_MUSTPASS(voe_base_->DeleteChannel(0));
-
- ANL();
- AOK();
- ANL();
- ANL();
-
- // >> end of GetSourceInfo
- // ------------------------------------------------------------------------
-
- // ------------------------------------------------------------------------
// >> SetExternalTransport
//
// - VE initialized
@@ -5271,127 +4580,54 @@
TEST(SetExternalTransport);
ANL();
- ptrTransport = new ExtendedTestTransport(netw);
+ ExtendedTestTransport* ptrTransport = new ExtendedTestTransport(voe_network);
// call without valid channel
- TEST_MUSTPASS(!netw->DeRegisterExternalTransport(0));
+ TEST_MUSTPASS(!voe_network ->DeRegisterExternalTransport(0));
MARK();
TEST_ERROR(VE_CHANNEL_NOT_VALID);
TEST_MUSTPASS(voe_base_->CreateChannel());
// different valid call combinations
- TEST_MUSTPASS(netw->RegisterExternalTransport(0, *ptrTransport));
+ TEST_MUSTPASS(voe_network ->RegisterExternalTransport(0, *ptrTransport));
MARK();
- TEST_MUSTPASS(netw->DeRegisterExternalTransport(0));
+ TEST_MUSTPASS(voe_network ->DeRegisterExternalTransport(0));
MARK();
- TEST_MUSTPASS(netw->DeRegisterExternalTransport(0));
+ TEST_MUSTPASS(voe_network ->DeRegisterExternalTransport(0));
MARK();
- TEST_MUSTPASS(netw->RegisterExternalTransport(0, *ptrTransport));
+ TEST_MUSTPASS(voe_network ->RegisterExternalTransport(0, *ptrTransport));
MARK();
- TEST_MUSTPASS(!netw->RegisterExternalTransport(0, *ptrTransport));
+ TEST_MUSTPASS(!voe_network ->RegisterExternalTransport(0, *ptrTransport));
MARK(); // must deregister first
- TEST_MUSTPASS(netw->DeRegisterExternalTransport(0));
+ TEST_MUSTPASS(voe_network ->DeRegisterExternalTransport(0));
MARK();
// STATE: external transport is disabled
-
- // initialize sending and ensure that external transport can't be enabled
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 1234, "127.0.0.2"));
- TEST_MUSTPASS(!netw->RegisterExternalTransport(0, *ptrTransport));
- MARK();
- TEST_ERROR(VE_SEND_SOCKETS_CONFLICT);
-
- // restart channel to ensure that "initialized sender" state is cleared
- TEST_MUSTPASS(voe_base_->DeleteChannel(0));
- TEST_MUSTPASS(voe_base_->CreateChannel());
-
- // initialize receiving and ensure that external transport can't be enabled
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 5678));
- TEST_MUSTPASS(!netw->RegisterExternalTransport(0, *ptrTransport));
- MARK();
- TEST_ERROR(VE_RECEIVE_SOCKETS_CONFLICT);
-
- // restart channel to ensure that "initialized receiver" state is cleared
TEST_MUSTPASS(voe_base_->DeleteChannel(0));
TEST_MUSTPASS(voe_base_->CreateChannel());
// enable external transport and verify that "emulated loopback" works
- TEST_MUSTPASS(netw->RegisterExternalTransport(0, *ptrTransport));
+ TEST_MUSTPASS(voe_network ->RegisterExternalTransport(0, *ptrTransport));
MARK();
TEST_MUSTPASS(voe_base_->StartSend(0)); // should only start recording
- TEST_MUSTPASS(!netw->RegisterExternalTransport(0, *ptrTransport));
+ TEST_MUSTPASS(!voe_network ->RegisterExternalTransport(0, *ptrTransport));
MARK(); // should fail
- TEST_MUSTPASS(netw->DeRegisterExternalTransport(0));
+ TEST_MUSTPASS(voe_network ->DeRegisterExternalTransport(0));
MARK();
- TEST_MUSTPASS(netw->RegisterExternalTransport(0, *ptrTransport));
+ TEST_MUSTPASS(voe_network ->RegisterExternalTransport(0, *ptrTransport));
MARK();
Play(0, 2000, true, true); // play file as mic and verify loopback audio
- TEST_MUSTPASS(netw->DeRegisterExternalTransport(0));
+ TEST_MUSTPASS(voe_network ->DeRegisterExternalTransport(0));
MARK();
- // STATE: external transport is disabled
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
- int testError = VE_FUNC_NOT_SUPPORTED;
-#else
- int testError = VE_EXTERNAL_TRANSPORT_ENABLED;
-#endif
-
- // check all APIs that should fail when external transport is enabled
- int DSCP, priority, serviceType, overrideDSCP, nBytes(0);
- bool useSetSockopt, enabled;
- TEST_MUSTPASS(netw->RegisterExternalTransport(0, *ptrTransport));
- MARK();
- TEST_MUSTPASS(!voe_base_->SetLocalReceiver(0, 12345));
- TEST_ERROR(VE_EXTERNAL_TRANSPORT_ENABLED);
- TEST_MUSTPASS(!voe_base_->GetLocalReceiver(0, rtpPort, rtcpPort, ipaddr));
- TEST_ERROR(VE_EXTERNAL_TRANSPORT_ENABLED);
- TEST_MUSTPASS(!voe_base_->SetSendDestination(0, 12345, "127.0.0.1"));
- TEST_ERROR(VE_EXTERNAL_TRANSPORT_ENABLED);
- TEST_MUSTPASS(!voe_base_->GetSendDestination(0, rtpPort, ipaddr, rtpPort,
- rtcpPort));
- TEST_ERROR(VE_EXTERNAL_TRANSPORT_ENABLED);
- TEST_MUSTPASS(!netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- TEST_ERROR(VE_EXTERNAL_TRANSPORT_ENABLED);
- TEST_MUSTPASS(!netw->EnableIPv6(0))
- TEST_ERROR(testError);
- TEST_MUSTPASS(netw->IPv6IsEnabled(0) != false)
- TEST_ERROR(VE_EXTERNAL_TRANSPORT_ENABLED);
- TEST_MUSTPASS(!netw->SetSourceFilter(0, 12345, 12346));
- TEST_ERROR(VE_EXTERNAL_TRANSPORT_ENABLED);
- TEST_MUSTPASS(!netw->GetSourceFilter(0, rtpPort, rtcpPort, ipaddr));
- TEST_ERROR(VE_EXTERNAL_TRANSPORT_ENABLED);
-
// modified i VoE 3.4 (can be called also for external transport)
TEST_MUSTPASS(voe_base_->StartReceive(0));
TEST_MUSTPASS(voe_base_->StopReceive(0));
-#if (!defined(_WIN32) && !defined(WEBRTC_LINUX) && !defined(WEBRTC_MAC)) || \
- defined(WEBRTC_EXTERNAL_TRANSPORT)
- testError = VE_FUNC_NOT_SUPPORTED;
-#else
- testError = VE_EXTERNAL_TRANSPORT_ENABLED;
-#endif
- TEST_MUSTPASS(!netw->SetSendTOS(0, 0));
- TEST_ERROR(testError);
- TEST_MUSTPASS(!netw->GetSendTOS(0, DSCP, priority, useSetSockopt));
- TEST_ERROR(testError);
-#if !defined(_WIN32) || defined(WEBRTC_EXTERNAL_TRANSPORT)
- testError = VE_FUNC_NOT_SUPPORTED;
-#else
- testError = VE_EXTERNAL_TRANSPORT_ENABLED;
-#endif
- TEST_MUSTPASS(!netw->SetSendGQoS(0, false, 0));
- TEST_ERROR(testError);
- TEST_MUSTPASS(!netw->GetSendGQoS(0, enabled, serviceType, overrideDSCP));
- TEST_ERROR(testError);
- char dummy[1] = { 'a' };
- TEST_MUSTPASS(!netw->SendUDPPacket(0, dummy, 1, nBytes));
- TEST_ERROR(VE_EXTERNAL_TRANSPORT_ENABLED);
-
// always disable external transport before deleting the Transport object;
// will lead to crash for RTCP transmission otherwise
- TEST_MUSTPASS(netw->DeRegisterExternalTransport(0));
+ TEST_MUSTPASS(voe_network ->DeRegisterExternalTransport(0));
MARK();
delete ptrTransport;
@@ -5406,350 +4642,6 @@
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
- // >> EnableIPv6
- //
- // - VE initialized
- // - no existing channels
- // - no media
- // - NOTE: set _ENABLE_IPV6_TESTS_ to include these tests
- // - http://www.microsoft.com/resources/documentation/windows/xp/all/
- // proddocs/en-us/sag_ip_v6_pro_rt_enable.mspx?mfr=true
- // >> ipv6 install
- // >> ipv6 [-v] if [IfIndex]
- // >> ping6 ::1
- // >> ping6 fe80::1
-
-#ifdef _ENABLE_IPV6_TESTS_
-
- TEST(EnableIPv6); ANL();
-
- // call without valid channel
- TEST_MUSTPASS(!netw->EnableIPv6(0)); MARK();
- TEST_ERROR(VE_CHANNEL_NOT_VALID);
-
- TEST_MUSTPASS(voe_base_->CreateChannel());
-
- // call with enabled external transport
- ptrTransport = new ExtendedTestTransport(netw);
- TEST_MUSTPASS(netw->RegisterExternalTransport(0, *ptrTransport));
- TEST_MUSTPASS(!netw->EnableIPv6(0)); MARK();
- TEST_ERROR(VE_EXTERNAL_TRANSPORT_ENABLED);
- TEST_MUSTPASS(netw->DeRegisterExternalTransport(0));
- delete ptrTransport;
-
- // Test "locking" to IPv4
- TEST_MUSTPASS(netw->IPv6IsEnabled(0)); MARK(); // After this call we cannot
- // enable IPv6
- TEST_MUSTPASS(!netw->EnableIPv6(0)); MARK(); // Should fail
-
- // Check that IPv6 address is invalid
- TEST_MUSTPASS(!voe_base_->SetSendDestination(0, 8000, "::1")); MARK(); // fail
-
- // New channel
- TEST_MUSTPASS(voe_base_->DeleteChannel(0));
- TEST_MUSTPASS(voe_base_->CreateChannel());
-
- // valid default call
- TEST_MUSTPASS(netw->EnableIPv6(0)); MARK();
- TEST_MUSTPASS(netw->GetLocalIP(localIP)); MARK(); // should still read IPv4
- TEST_LOG("[local IPv4: %s]", localIP);
-
- // ensure that Ipv6 is enabled
- TEST_MUSTPASS(netw->IPv6IsEnabled(0) != true);
-
- // check that IPv4 address is invalid
- TEST_MUSTPASS(!voe_base_->SetSendDestination(0, 8000, "127.0.0.1"));
- TEST_ERROR(VE_INVALID_IP_ADDRESS);
-
- // verify usage of IPv6 loopback address
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 8000));
- // IPv6 loopback address is 0:0:0:0:0:0:0:1
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 8000, "::1"));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(!netw->EnableIPv6(0)); MARK(); // Should fail
- TEST_MUSTPASS(voe_base_->StartSend(0));
- Play(0, 2000, true, true);
- ANL();
-
- // Restart channel
- TEST_MUSTPASS(voe_base_->DeleteChannel(0));
- TEST_MUSTPASS(voe_base_->CreateChannel());
-
- TEST_MUSTPASS(netw->EnableIPv6(0)); MARK();
- // ensure that Ipv6 is enabled
- TEST_MUSTPASS(netw->IPv6IsEnabled(0) != true);
-
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 8000));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- // IPv6 loopback address is 0:0:0:0:0:0:0:1
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 8000, "::1"));
- TEST_MUSTPASS(voe_base_->StartPlayout(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- file->StartPlayingFileAsMicrophone(0, _mgr.AudioFilename(), true,
- true);
- SleepMs(500); // ensure that we receieve some packets
-
- // SetSourceFilter and GetSourceFilter
- TEST(SetSourceFilter and GetSourceFilter for IPv6); ANL();
- char sourceIp[64] =
- { 0};
- char filterIp[64] =
- { 0};
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, sourceIp));
- TEST_LOG("Source port: %d \n", rtpPort);
- TEST_LOG("Source RTCP port: %d \n", rtcpPort);
- TEST_LOG("Source IP: %s \n", sourceIp);
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, filterIp));
- TEST_LOG("Filter port RTP: %d \n", rtpPort);
- TEST_LOG("Filter port RTCP: %d \n", rtcpPort);
- TEST_LOG("Filter IP: %s \n", filterIp);
- TEST_MUSTPASS(0 != rtpPort);
- TEST_MUSTPASS(0 != rtcpPort);
- TEST_MUSTPASS(filterIp[0] != '\0');
- TEST_LOG("Set filter IP to %s => should hear audio\n", sourceIp);
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, sourceIp));
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, filterIp));
- TEST_MUSTPASS(0 != rtpPort);
- TEST_MUSTPASS(0 != rtcpPort);
- TEST_MUSTPASS(_stricmp(filterIp, sourceIp));
- SleepMs(1500);
- TEST_LOG("Set filter IP to ::10:10:10 => should *not* hear audio\n");
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, "::10:10:10"));
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, filterIp));
- TEST_MUSTPASS(_stricmp(filterIp, "::10:10:10"));
- SleepMs(1500);
- TEST_LOG("Disable IP filter => should hear audio again\n");
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, "::0"));
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, filterIp));
- TEST_MUSTPASS(_stricmp(filterIp, "::"));
- SleepMs(1500);
- TEST_LOG("Set filter IP to ::10:10:10 => should *not* hear audio\n");
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, "::10:10:10"));
- SleepMs(1500);
- TEST_LOG("Disable IP filter => should hear audio again\n");
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, NULL));
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, filterIp));
- TEST_MUSTPASS(filterIp[0] != '\0');
- SleepMs(1500);
- TEST_LOG("Set filter IP to ::10:10:10 => should *not* hear audio\n");
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, "::10:10:10"));
- SleepMs(1500);
- TEST_LOG("Disable IP filter => should hear audio again\n");
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, "::"));
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, filterIp));
- TEST_MUSTPASS(_stricmp(filterIp, "::"));
- SleepMs(1500);
-
- file->StopPlayingFileAsMicrophone(0);
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(voe_base_->StopReceive(0));
-
- TEST_MUSTPASS(voe_base_->DeleteChannel(0));
-
-#endif // #ifdef _ENABLE_IPV6_TESTS_
- // >> end of EnableIPv6
- // ------------------------------------------------------------------------
-
- // ------------------------------------------------------------------------
- // >> SetSourceFilter
- //
- // - VE initialized
- // - no existing channels
- // - no media
- TEST(SetSourceFilter);
- ANL();
-
- // call without valid channel
- TEST_MUSTPASS(!netw->SetSourceFilter(0, 12345));
- MARK();
- TEST_ERROR(VE_CHANNEL_NOT_VALID);
-
- TEST_MUSTPASS(voe_base_->CreateChannel());
-
- // invalid parameters
- TEST_MUSTPASS(!netw->SetSourceFilter(0, 65536));
- MARK();
- TEST_ERROR(VE_INVALID_PORT_NMBR);
- TEST_MUSTPASS(!netw->SetSourceFilter(0, 12345, 65536));
- MARK();
- TEST_ERROR(VE_INVALID_PORT_NMBR);
- TEST_MUSTPASS(!netw->SetSourceFilter(0, 12345, 12346, "300.300.300.300"));
- MARK();
- TEST_ERROR(VE_INVALID_IP_ADDRESS);
-
- // STATE: RTP filter port is 12345, RTCP filter port is 12346
-
- // disable all filters and ensure that media is received
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, NULL));
- MARK();
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 2000, kVoEDefault, localIP));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 2000, localIP));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- SleepMs(sleepTime);
-
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- TEST_MUSTPASS(rtpPort != 2000);
- TEST_MUSTPASS(rtcpPort != 2001);
- TEST_MUSTPASS(strcmp(ipaddr, localIP) != 0);
-
- // clear states and restart loopback session
- TEST_MUSTPASS(voe_base_->DeleteChannel(0)); // clear source info state
- TEST_MUSTPASS(voe_base_->CreateChannel());
-
- // set RTP filter to port 2002 and verify that source 2000 is blocked
- TEST_MUSTPASS(netw->SetSourceFilter(0, 2002, 0, NULL));;
- MARK();
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 2000, kVoEDefault, localIP));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 2000, localIP));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- SleepMs(sleepTime);
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- TEST_MUSTPASS(rtpPort != 0);
- TEST_MUSTPASS(strcmp(ipaddr, "") != 0);
-
- // ensure that received packets originates from 2002 and that they now pass
- // the filter
- TEST_MUSTPASS(voe_base_->StopReceive(0));
- TEST_MUSTPASS(voe_base_->StopSend(0));
- // RTP source is 2002
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 2002, kVoEDefault, localIP));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 2002, localIP));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- SleepMs(sleepTime);
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- TEST_MUSTPASS(rtpPort != 2002);
- TEST_MUSTPASS(strcmp(ipaddr, localIP) != 0);
-
- // clear states and restart loopback session
- TEST_MUSTPASS(voe_base_->DeleteChannel(0)); // clear source info state
- TEST_MUSTPASS(voe_base_->CreateChannel());
-
- // set IP filter to local IP and verify that default loopback stream is
- // blocked
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, localIP));;
- MARK();
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 2000));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 2000, "127.0.0.1"));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- SleepMs(sleepTime);
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- TEST_MUSTPASS(rtpPort != 0);
- TEST_MUSTPASS(strcmp(ipaddr, "") != 0);
-
- // ensure that received packets originates from the local IP and that they
- // now pass the filter
- TEST_MUSTPASS(voe_base_->StopReceive(0));
- TEST_MUSTPASS(voe_base_->StopSend(0));
- // should pass the filter
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 2000, kVoEDefault, localIP));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 2000, localIP));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- SleepMs(sleepTime);
- TEST_MUSTPASS(netw->GetSourceInfo(0, rtpPort, rtcpPort, ipaddr));
- TEST_MUSTPASS(rtpPort != 2000);
- TEST_MUSTPASS(strcmp(ipaddr, localIP) != 0);
-
- TEST_MUSTPASS(voe_base_->StopReceive(0));
- TEST_MUSTPASS(voe_base_->StopSend(0));
-
- // STATE: no active media, IP filter is active
-
- // disable all filters
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, NULL));;
- MARK();
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, ipaddr));
- TEST_MUSTPASS(rtpPort != 0);
- TEST_MUSTPASS(rtcpPort != 0);
- TEST_MUSTPASS(strcmp(ipaddr, "") != 0);
-
- TEST_MUSTPASS(voe_base_->DeleteChannel(0));
- ANL();
- AOK();
- ANL();
- ANL();
-
- // >> end of SetSourceFilter
- // ------------------------------------------------------------------------
-
- // ------------------------------------------------------------------------
- // >> GetSourceFilter
- //
- // - VE initialized
- // - no existing channels
- // - no media
- TEST(GetSourceFilter);
- ANL();
-
- // call without valid channel
- TEST_MUSTPASS(!netw->GetSourceFilter(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_ERROR(VE_CHANNEL_NOT_VALID);
-
- TEST_MUSTPASS(voe_base_->CreateChannel());
-
- // invalid input parameters
- TEST_MUSTPASS(!netw->GetSourceFilter(0, rtpPort, rtcpPort, NULL));
- MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
-
- // valid call without any filter set
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtpPort != 0);
- TEST_MUSTPASS(rtcpPort != 0);
- TEST_MUSTPASS(strcmp(ipaddr, "") != 0);
-
- // STATE: no active media and no enabled filters
-
- // set different filters and verify that they "bite"
- TEST_MUSTPASS(netw->SetSourceFilter(0, 54321, 0, NULL));
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtpPort != 54321);
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, NULL));
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtpPort != 0);
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 15425, NULL));
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtcpPort != 15425);
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, NULL));
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(rtcpPort != 0);
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, "192.168.199.19"));
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(strcmp(ipaddr, "192.168.199.19") != 0);
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, NULL));
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(strcmp(ipaddr, "") != 0);
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, "0.0.0.0"));
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(strcmp(ipaddr, "0.0.0.0") != 0);
- TEST_MUSTPASS(netw->SetSourceFilter(0, 0, 0, NULL));
- TEST_MUSTPASS(netw->GetSourceFilter(0, rtpPort, rtcpPort, ipaddr));
- MARK();
- TEST_MUSTPASS(strcmp(ipaddr, "") != 0);
-
- TEST_MUSTPASS(voe_base_->DeleteChannel(0));
- ANL();
- AOK();
- ANL();
- ANL();
-
- // >> end of GetSourceFilter
- // ------------------------------------------------------------------------
-
- // ------------------------------------------------------------------------
// >> RegisterDeadOrAliveObserver
// >> DeRegisterDeadOrAliveObserver
//
@@ -5762,24 +4654,24 @@
ANL();
// call without valid channel
- TEST_MUSTPASS(!netw->RegisterDeadOrAliveObserver(0, *this));
+ TEST_MUSTPASS(!voe_network ->RegisterDeadOrAliveObserver(0, *this));
MARK();
TEST_ERROR(VE_CHANNEL_NOT_VALID);
TEST_MUSTPASS(voe_base_->CreateChannel());
- TEST_MUSTPASS(netw->RegisterDeadOrAliveObserver(0, *this));
+ TEST_MUSTPASS(voe_network ->RegisterDeadOrAliveObserver(0, *this));
MARK();
- TEST_MUSTPASS(!netw->RegisterDeadOrAliveObserver(0, *this));
+ TEST_MUSTPASS(!voe_network ->RegisterDeadOrAliveObserver(0, *this));
MARK(); // already registered
TEST_ERROR(VE_INVALID_OPERATION);
- TEST_MUSTPASS(netw->DeRegisterDeadOrAliveObserver(0));
+ TEST_MUSTPASS(voe_network ->DeRegisterDeadOrAliveObserver(0));
MARK();
- TEST_MUSTPASS(netw->DeRegisterDeadOrAliveObserver(0));
+ TEST_MUSTPASS(voe_network ->DeRegisterDeadOrAliveObserver(0));
MARK(); // OK to do it again
- TEST_MUSTPASS(netw->RegisterDeadOrAliveObserver(0, *this));
+ TEST_MUSTPASS(voe_network ->RegisterDeadOrAliveObserver(0, *this));
MARK();
- TEST_MUSTPASS(netw->DeRegisterDeadOrAliveObserver(0));
+ TEST_MUSTPASS(voe_network ->DeRegisterDeadOrAliveObserver(0));
MARK();
TEST_MUSTPASS(voe_base_->DeleteChannel(0));
@@ -5798,39 +4690,43 @@
// - no media
// call without valid channel
- TEST_MUSTPASS(!netw->SetPeriodicDeadOrAliveStatus(0, false));
+ TEST_MUSTPASS(!voe_network ->SetPeriodicDeadOrAliveStatus(0, false));
MARK();
TEST_ERROR(VE_CHANNEL_NOT_VALID);
TEST_MUSTPASS(voe_base_->CreateChannel());
// Invalid paramters
- TEST_MUSTPASS(!netw->SetPeriodicDeadOrAliveStatus(0, true, 0));
+ TEST_MUSTPASS(!voe_network ->SetPeriodicDeadOrAliveStatus(0, true, 0));
MARK();
TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetPeriodicDeadOrAliveStatus(0, true, 151));
+ TEST_MUSTPASS(!voe_network ->SetPeriodicDeadOrAliveStatus(0, true, 151));
MARK();
TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetPeriodicDeadOrAliveStatus(1, true, 10));
+ TEST_MUSTPASS(!voe_network ->SetPeriodicDeadOrAliveStatus(1, true, 10));
MARK();
TEST_ERROR(VE_CHANNEL_NOT_VALID);
int sampleTime(0);
+ bool enabled;
// Valid parameters
- TEST_MUSTPASS(netw->SetPeriodicDeadOrAliveStatus(0, true, 1));
+ TEST_MUSTPASS(voe_network ->SetPeriodicDeadOrAliveStatus(0, true, 1));
MARK();
- TEST_MUSTPASS(netw->GetPeriodicDeadOrAliveStatus(0, enabled, sampleTime));
+ TEST_MUSTPASS(
+ voe_network ->GetPeriodicDeadOrAliveStatus(0, enabled, sampleTime));
TEST_MUSTPASS(enabled != true);
TEST_MUSTPASS(sampleTime != 1);
- TEST_MUSTPASS(netw->SetPeriodicDeadOrAliveStatus(0, true, 150));
+ TEST_MUSTPASS(voe_network ->SetPeriodicDeadOrAliveStatus(0, true, 150));
MARK();
- TEST_MUSTPASS(netw->GetPeriodicDeadOrAliveStatus(0, enabled, sampleTime));
+ TEST_MUSTPASS(
+ voe_network ->GetPeriodicDeadOrAliveStatus(0, enabled, sampleTime));
TEST_MUSTPASS(enabled != true);
TEST_MUSTPASS(sampleTime != 150);
- TEST_MUSTPASS(netw->SetPeriodicDeadOrAliveStatus(0, false));
+ TEST_MUSTPASS(voe_network ->SetPeriodicDeadOrAliveStatus(0, false));
MARK();
- TEST_MUSTPASS(netw->GetPeriodicDeadOrAliveStatus(0, enabled, sampleTime));
+ TEST_MUSTPASS(
+ voe_network ->GetPeriodicDeadOrAliveStatus(0, enabled, sampleTime));
TEST_MUSTPASS(enabled != false);
TEST_MUSTPASS(sampleTime != 150); // ensure last set time isnt modified
@@ -5839,25 +4735,25 @@
// STATE: full duplex media is active
// test the dead-or-alive mechanism
- TEST_MUSTPASS(netw->RegisterDeadOrAliveObserver(0, *this));
+ TEST_MUSTPASS(voe_network ->RegisterDeadOrAliveObserver(0, *this));
MARK();
TEST_LOG("\nVerify that Alive callbacks are received (dT=2sec): ");
fflush(NULL);
- TEST_MUSTPASS(netw->SetPeriodicDeadOrAliveStatus(0, true, 2));
+ TEST_MUSTPASS(voe_network ->SetPeriodicDeadOrAliveStatus(0, true, 2));
SleepMs(6000);
TEST_LOG("\nChange dT to 1 second: ");
fflush(NULL);
- TEST_MUSTPASS(netw->SetPeriodicDeadOrAliveStatus(0, true, 1));
+ TEST_MUSTPASS(voe_network ->SetPeriodicDeadOrAliveStatus(0, true, 1));
SleepMs(6000);
TEST_LOG("\nDisable dead-or-alive callbacks: ");
fflush(NULL);
- TEST_MUSTPASS(netw->SetPeriodicDeadOrAliveStatus(0, false));
+ TEST_MUSTPASS(voe_network ->SetPeriodicDeadOrAliveStatus(0, false));
SleepMs(6000);
TEST_LOG("\nStop sending and enable callbacks again.\n");
TEST_LOG("Verify that Dead callbacks are received (dT=2sec): ");
fflush(NULL);
TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(netw->SetPeriodicDeadOrAliveStatus(0, true, 2));
+ TEST_MUSTPASS(voe_network ->SetPeriodicDeadOrAliveStatus(0, true, 2));
SleepMs(6000);
TEST_MUSTPASS(voe_base_->StartSend(0));
TEST_LOG("\nRestart sending.\n");
@@ -5866,8 +4762,8 @@
SleepMs(6000);
TEST_LOG("\nDisable dead-or-alive callbacks.");
fflush(NULL);
- TEST_MUSTPASS(netw->SetPeriodicDeadOrAliveStatus(0, false));
- TEST_MUSTPASS(netw->DeRegisterDeadOrAliveObserver(0));
+ TEST_MUSTPASS(voe_network ->SetPeriodicDeadOrAliveStatus(0, false));
+ TEST_MUSTPASS(voe_network ->DeRegisterDeadOrAliveObserver(0));
MARK();
StopMedia(0);
@@ -5898,47 +4794,52 @@
ANL();
// call without existing valid channel
- TEST_MUSTPASS(!netw->SetPacketTimeoutNotification(0, false));
+ TEST_MUSTPASS(!voe_network ->SetPacketTimeoutNotification(0, false));
MARK();
TEST_ERROR(VE_CHANNEL_NOT_VALID);
TEST_MUSTPASS(voe_base_->CreateChannel());
// invalid function calls
- TEST_MUSTPASS(!netw->SetPacketTimeoutNotification(0, true, 0));
+ TEST_MUSTPASS(!voe_network ->SetPacketTimeoutNotification(0, true, 0));
MARK();
TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetPacketTimeoutNotification(0, true, 151));
+ TEST_MUSTPASS(!voe_network ->SetPacketTimeoutNotification(0, true, 151));
MARK();
TEST_ERROR(VE_INVALID_ARGUMENT);
// valid function calls (no active media)
- TEST_MUSTPASS(netw->SetPacketTimeoutNotification(0, true, 2));
+ TEST_MUSTPASS(voe_network ->SetPacketTimeoutNotification(0, true, 2));
MARK();
- TEST_MUSTPASS(netw->GetPacketTimeoutNotification(0, enabled, timeOut));
+ TEST_MUSTPASS(voe_network ->GetPacketTimeoutNotification(0, enabled,
+ timeOut));
MARK();
TEST_MUSTPASS(enabled != true);
TEST_MUSTPASS(timeOut != 2);
- TEST_MUSTPASS(netw->SetPacketTimeoutNotification(0, false));
+ TEST_MUSTPASS(voe_network ->SetPacketTimeoutNotification(0, false));
MARK();
- TEST_MUSTPASS(netw->GetPacketTimeoutNotification(0, enabled, timeOut));
+ TEST_MUSTPASS(voe_network ->GetPacketTimeoutNotification(0, enabled,
+ timeOut));
MARK();
TEST_MUSTPASS(enabled != false);
- TEST_MUSTPASS(netw->SetPacketTimeoutNotification(0, true, 10));
+ TEST_MUSTPASS(voe_network ->SetPacketTimeoutNotification(0, true, 10));
MARK();
- TEST_MUSTPASS(netw->GetPacketTimeoutNotification(0, enabled, timeOut));
+ TEST_MUSTPASS(voe_network ->GetPacketTimeoutNotification(0, enabled,
+ timeOut));
MARK();
TEST_MUSTPASS(enabled != true);
TEST_MUSTPASS(timeOut != 10);
- TEST_MUSTPASS(netw->SetPacketTimeoutNotification(0, true, 2));
+ TEST_MUSTPASS(voe_network ->SetPacketTimeoutNotification(0, true, 2));
MARK();
- TEST_MUSTPASS(netw->GetPacketTimeoutNotification(0, enabled, timeOut));
+ TEST_MUSTPASS(voe_network ->GetPacketTimeoutNotification(0, enabled,
+ timeOut));
MARK();
TEST_MUSTPASS(enabled != true);
TEST_MUSTPASS(timeOut != 2);
- TEST_MUSTPASS(netw->SetPacketTimeoutNotification(0, false));
+ TEST_MUSTPASS(voe_network ->SetPacketTimeoutNotification(0, false));
MARK();
- TEST_MUSTPASS(netw->GetPacketTimeoutNotification(0, enabled, timeOut));
+ TEST_MUSTPASS(voe_network ->GetPacketTimeoutNotification(0, enabled,
+ timeOut));
MARK();
TEST_MUSTPASS(enabled != false);
@@ -5947,512 +4848,10 @@
AOK();
ANL();
ANL();
-
- // >> end of SetPacketTimeoutNotification
- // ------------------------------------------------------------------------
-
- // ------------------------------------------------------------------------
- // >> SendUDPPacket
- //
- // - VE initialized
- // - no existing channels
- // - no media
-
-
- // >> end of SendUDPPacket
- // ------------------------------------------------------------------------
-
- // ------------------------------------------------------------------------
- // >> SetSendTOS
- //
- // - VE initialized
- // - no existing channels
- // - no media
- TEST(SetSendTOS);
- ANL();
-#if defined(_WIN32) || defined(WEBRTC_MAC) || defined(WEBRTC_LINUX)
-
- // call without existing valid channel
-
- TEST_MUSTPASS(!netw->SetSendTOS(0, 0)); MARK();
- TEST_ERROR(VE_CHANNEL_NOT_VALID);
-
- TEST_MUSTPASS(voe_base_->CreateChannel());
-
- // trivial invalid function calls
- TEST_MUSTPASS(!netw->SetSendTOS(0, -1)); MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetSendTOS(0, 64)); MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetSendTOS(0, 1, -2)); MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetSendTOS(0, 1, 8)); MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetSendTOS(0, 1)); MARK();
- TEST_ERROR(VE_SOCKET_ERROR); // must create sockets first
-
-#ifdef _WIN32
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 3000));
-
- // enable ToS using SetSockopt (should work without local binding)
- TEST_MUSTPASS(netw->SetSendTOS(0, 1, -1, true)); MARK();
- TEST_MUSTPASS(netw->GetSendTOS(0, DSCP, priority, useSetSockopt)); MARK();
- TEST_MUSTPASS(DSCP != 1);
- TEST_MUSTPASS(priority != 0);
- TEST_MUSTPASS(useSetSockopt != true);
-
- // try to disable SetSockopt while ToS is enabled (should fail)
- TEST_MUSTPASS(!netw->SetSendTOS(0, 1, -1, false)); MARK();
- TEST_ERROR(VE_TOS_INVALID); // must disable ToS before enabling SetSockopt
-
- // disable ToS to be able to stop using SetSockopt
- TEST_MUSTPASS(netw->SetSendTOS(0, 0, -1, true)); MARK(); // disable ToS
- TEST_MUSTPASS(netw->GetSendTOS(0, DSCP, priority, useSetSockopt)); MARK();
- TEST_MUSTPASS(DSCP != 0);
- TEST_MUSTPASS(priority != 0);
- TEST_MUSTPASS(useSetSockopt != true);
-
- // to use the "non-SetSockopt" method, local binding is required,
- // trying without it should fail
- TEST_MUSTPASS(!netw->SetSendTOS(0, 1, -1, false)); MARK();
- TEST_ERROR(VE_TOS_ERROR); // must bind to local IP first
-
- // bind to local IP and try again (should work this time)
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 12345, kVoEDefault, localIP));
- TEST_LOG("\nThis test needs to be run as administrator\n");
- TEST_MUSTPASS(netw->SetSendTOS(0, 1, -1, false)); MARK();
- TEST_MUSTPASS(netw->GetSendTOS(0, DSCP, priority, useSetSockopt)); MARK();
- TEST_MUSTPASS(DSCP != 1);
- TEST_MUSTPASS(priority != 0);
- TEST_MUSTPASS(useSetSockopt != false);
-
- // STATE: binded to local IP, local port is 12345 and DSCP is 1 (not using
- // SetSockopt)
-
- // verify loopback audio with the current settings
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, localIP));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- Play(0, 2000, true, true); // file should be played out here...
-
-#ifdef _SEND_TO_REMOTE_IP_
- // Send to remote destination and verify the DSCP using Wireshark.
- // Use filter ip.src == "RemoteIP".
- TEST_LOG("\nUse Wireshark and verify a correctly received DSCP at the "
- "remote side!\n");
- TEST_LOG("Sending approx. 5 packets to %s:%d for each DSCP below:\n",
- RemoteIP, RemotePort);
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, RemotePort, RemoteIP));
- TEST_LOG(" DSCP is set to 0x%02x\n", 1);
- SleepMs(100);
-
- // Change the DSCP while sending is active and verify on remote side.
- TEST_MUSTPASS(netw->SetSendTOS(0, 2));
- TEST_MUSTPASS(netw->GetSendTOS(0, DSCP, priority, useSetSockopt));
- TEST_LOG(" DSCP is set to 0x%02x\n", DSCP);
- SleepMs(100);
-
- // Change the DSCP while sending is active and verify on remote side.
- TEST_MUSTPASS(netw->SetSendTOS(0, 63));
- TEST_MUSTPASS(netw->GetSendTOS(0, DSCP, priority, useSetSockopt));
- TEST_LOG(" DSCP is set to 0x%02x\n", DSCP);
- SleepMs(100);
-
- // stop and resume sending
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- TEST_MUSTPASS(netw->GetSendTOS(0, DSCP, priority, useSetSockopt));
- TEST_LOG(" DSCP is set to 0x%02x\n", DSCP);
- SleepMs(100);
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(voe_base_->StopReceive(0));
- TEST_MUSTPASS(netw->SetSendTOS(0, 0));
-#endif // _SEND_TO_REMOTE_IP_
- // Windows priority tests (priority cannot be set using setsockopt on Win)
- TEST_LOG("Testing priority\n");
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, localIP));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(!netw->SetSendTOS(0, 0, 3, true)); // Should fail
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(netw->SetSendTOS(0, 0, 3, false));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- Play(0, 2000, true, true); // file should be played out here...
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(netw->SetSendTOS(0, 1, 3, false));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- Play(0, 2000, true, true); // file should be played out here...
-
- TEST_MUSTPASS(voe_base_->DeleteChannel(0));
- TEST_MUSTPASS(voe_base_->CreateChannel());
-#endif // _WIN32
- // STATE: no media, disabled ToS, no defined receiver
-
- // Repeat tests above but using setsockopt() this time.
- // Binding to local IP should not be required.
-
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 12345, kVoEDefault));
- TEST_MUSTPASS(netw->SetSendTOS(0, 10, -1, true)); MARK();
- TEST_MUSTPASS(netw->GetSendTOS(0, DSCP, priority, useSetSockopt)); MARK();
- TEST_MUSTPASS(DSCP != 10);
- TEST_MUSTPASS(priority != 0);
- TEST_MUSTPASS(useSetSockopt != true);
-
- // STATE: *not* binded to local IP, local port is 12345 and DSCP is 10
- // (using SetSockopt)
-
- // verify loopback audio with the current settings
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, "127.0.0.1"));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- Play(0, 2000, true, true); // file should be played out here...
-
-#ifdef _SEND_TO_REMOTE_IP_
- // Send to remote destination and verify the DSCP using Wireshark.
- // Use filter ip.src == "RemoteIP".
- TEST_LOG("\nUse Wireshark and verify a correctly received DSCP at the"
- " remote side!\n");
- TEST_LOG("Sending approx. 5 packets to %s:%d for each DSCP below:\n",
- RemoteIP, RemotePort);
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, RemotePort, RemoteIP));
- TEST_MUSTPASS(netw->GetSendTOS(0, DSCP, priority, useSetSockopt));
- TEST_LOG(" DSCP is set to 0x%02x (setsockopt)\n", DSCP);
- SleepMs(100);
-
- // Change the DSCP while sending is active and verify on remote side.
- TEST_MUSTPASS(netw->SetSendTOS(0, 20, -1, true)); // use setsockopt()
- TEST_MUSTPASS(netw->GetSendTOS(0, DSCP, priority, useSetSockopt));
- TEST_LOG(" DSCP is set to 0x%02x (setsockopt)\n", DSCP);
- SleepMs(100);
-
- // Change the DSCP while sending is active and verify on remote side.
- TEST_MUSTPASS(netw->SetSendTOS(0, 61, -1, true)); // use setsockopt()
- TEST_MUSTPASS(netw->GetSendTOS(0, DSCP, priority, useSetSockopt));
- TEST_LOG(" DSCP is set to 0x%02x (setsockopt)\n", DSCP);
- SleepMs(100);
-
- // stop and resume sending
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- TEST_MUSTPASS(netw->GetSendTOS(0, DSCP, priority, useSetSockopt));
- TEST_LOG(" DSCP is set to 0x%02x (setsockopt)\n", DSCP);
- SleepMs(100);
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(voe_base_->StopReceive(0));
- TEST_MUSTPASS(netw->SetSendTOS(0, 0, -1, true));
-#endif // _SEND_TO_REMOTE_IP_
-#if defined(WEBRTC_LINUX)
- // Linux priority tests (using setsockopt)
- TEST_LOG("Testing priority\n");
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, localIP));
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(netw->SetSendTOS(0, 0, 3, true));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- Play(0, 2000, true, true); // file should be played out here...
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(netw->SetSendTOS(0, 1, 3, true));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- Play(0, 2000, true, true); // file should be played out here...
-#endif // #if defined(WEBRTC_LINUX)
-#if !defined(_WIN32) && !defined(WEBRTC_LINUX)
- // Fail tests for other than Wind and Linux
- TEST_MUSTPASS(!netw->SetSendTOS(0, 0, 3, false)); // Should fail
- TEST_ERROR(VE_INVALID_ARGUMENT);
-#endif // #if !defined(_WIN32) && !defined(WEBRTC_LINUX)
- TEST_MUSTPASS(voe_base_->DeleteChannel(0));
- ANL(); AOK(); ANL(); ANL();
-
- // END #if defined(_WIN32) || defined(WEBRTC_MAC) || defined(WEBRTC_LINUX)
-#else
- TEST_LOG("Skipping ToS tests - _WIN32, LINUX, MAC is not defined or "
- "WEBRTC_ANDROID is defined");
-#endif
-
- // >> end of SetSendTOS
- // ------------------------------------------------------------------------
-
- // ------------------------------------------------------------------------
- // >> SetSendGQoS (Windows only)
- //
- // - VE initialized
- // - no existing channels
- // - no media
- //
- // From qos.h:
- //
- // #define SERVICETYPE_NOTRAFFIC 0x00000000
- // #define SERVICETYPE_BESTEFFORT 0x00000001 (*)
- // #define SERVICETYPE_CONTROLLEDLOAD 0x00000002 (*)
- // #define SERVICETYPE_GUARANTEED 0x00000003 (*)
- // #define SERVICETYPE_NETWORK_UNAVAILABLE 0x00000004
- // #define SERVICETYPE_GENERAL_INFORMATION 0x00000005
- // #define SERVICETYPE_NOCHANGE 0x00000006
- // #define SERVICETYPE_NONCONFORMING 0x00000009
- // #define SERVICETYPE_NETWORK_CONTROL 0x0000000A
- // #define SERVICETYPE_QUALITATIVE 0x0000000D (*)
- //
- // #define SERVICE_BESTEFFORT 0x80010000
- // #define SERVICE_CONTROLLEDLOAD 0x80020000
- // #define SERVICE_GUARANTEED 0x80040000
- // #define SERVICE_QUALITATIVE 0x80200000
- //
- // (*) supported in WEBRTC VoE
- TEST(SetSendGQoS);
- ANL();
-#ifdef _WIN32
-
- // call without existing valid channel
- TEST_MUSTPASS(!netw->SetSendGQoS(0, false, 0)); MARK();
- TEST_ERROR(VE_CHANNEL_NOT_VALID);
-
- TEST_MUSTPASS(voe_base_->CreateChannel());
-
- // supported service type but no sockets
- TEST_MUSTPASS(!netw->SetSendGQoS(0, true, SERVICETYPE_BESTEFFORT)); MARK();
- TEST_ERROR(VE_SOCKETS_NOT_INITED);
-
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 12345));
-
- // supported service type but sender is not initialized
- TEST_MUSTPASS(!netw->SetSendGQoS(0, true, SERVICETYPE_BESTEFFORT)); MARK();
- TEST_ERROR(VE_DESTINATION_NOT_INITED);
-
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, "127.0.0.1"));
-
- // invalid service types
- TEST_MUSTPASS(!netw->SetSendGQoS(0, true, SERVICETYPE_NOTRAFFIC)); MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetSendGQoS(0, true, SERVICETYPE_NETWORK_UNAVAILABLE));
- MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetSendGQoS(0, true, SERVICETYPE_GENERAL_INFORMATION));
- MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetSendGQoS(0, true, SERVICETYPE_NOCHANGE)); MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetSendGQoS(0, true, SERVICETYPE_NONCONFORMING));
- MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetSendGQoS(0, true, SERVICETYPE_NETWORK_CONTROL));
- MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetSendGQoS(0, true, SERVICE_BESTEFFORT)); MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetSendGQoS(0, true, SERVICE_CONTROLLEDLOAD)); MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetSendGQoS(0, true, SERVICE_GUARANTEED)); MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(!netw->SetSendGQoS(0, true, SERVICE_QUALITATIVE)); MARK();
- TEST_ERROR(VE_INVALID_ARGUMENT);
-
- // Is ToS enabled here?
-
- // Settings which don't require binding to local IP
-
- // set SERVICETYPE_BESTEFFORT
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_BESTEFFORT)); MARK();
- TEST_MUSTPASS(netw->GetSendGQoS(0, enabled, serviceType, overrideDSCP));
- MARK();
- TEST_MUSTPASS(enabled != true);
- TEST_MUSTPASS(serviceType != SERVICETYPE_BESTEFFORT);
- TEST_MUSTPASS(overrideDSCP != false);
-
- // set SERVICETYPE_CONTROLLEDLOAD
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_CONTROLLEDLOAD));
- MARK();
- TEST_MUSTPASS(netw->GetSendGQoS(0, enabled, serviceType, overrideDSCP));
- MARK();
- TEST_MUSTPASS(enabled != true);
- TEST_MUSTPASS(serviceType != SERVICETYPE_CONTROLLEDLOAD);
- TEST_MUSTPASS(overrideDSCP != false);
-
- // set SERVICETYPE_GUARANTEED
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_GUARANTEED)); MARK();
- TEST_MUSTPASS(netw->GetSendGQoS(0, enabled, serviceType, overrideDSCP));
- MARK();
- TEST_MUSTPASS(enabled != true);
- TEST_MUSTPASS(serviceType != SERVICETYPE_GUARANTEED);
- TEST_MUSTPASS(overrideDSCP != false);
-
- // set SERVICETYPE_QUALITATIVE
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_QUALITATIVE)); MARK();
- TEST_MUSTPASS(netw->GetSendGQoS(0, enabled, serviceType, overrideDSCP));
- MARK();
- TEST_MUSTPASS(enabled != true);
- TEST_MUSTPASS(serviceType != SERVICETYPE_QUALITATIVE);
- TEST_MUSTPASS(overrideDSCP != false);
-
- // disable GQoS
- TEST_MUSTPASS(netw->SetSendGQoS(0, false, 0)); MARK();
- TEST_MUSTPASS(netw->GetSendGQoS(0, enabled, serviceType, overrideDSCP));
- MARK();
- TEST_MUSTPASS(enabled != false);
- TEST_MUSTPASS(serviceType != SERVICETYPE_QUALITATIVE);
- TEST_MUSTPASS(overrideDSCP != false);
-
- // STATE: diabled QGoS, sockets exists, sending side is initialized, no media
-
- // Loopback tests using the four different GQoS settings
-
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_BESTEFFORT)); MARK();
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- ANL();
- TEST_LOG("[SERVICETYPE_BESTEFFORT]");
- Play(0, 2000, true, true); // file should be played out here...
-
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_CONTROLLEDLOAD)); MARK();
- ANL();
- TEST_LOG("[SERVICETYPE_CONTROLLEDLOAD]");
- Play(0, 2000, true, true); // file should be played out here...
-
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_GUARANTEED)); MARK();
- ANL();
- TEST_LOG("[SERVICETYPE_GUARANTEED]");
- Play(0, 2000, true, true); // file should be played out here...
-
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_QUALITATIVE)); MARK();
- ANL();
- TEST_LOG("[SERVICETYPE_QUALITATIVE]");
- Play(0, 2000, true, true); // file should be played out here...
-
-#ifdef _SEND_TO_REMOTE_IP_
- // Send to remote destination and verify the DSCP mapping using Wireshark.
- // Use filter ip.src == "RemoteIP".
-
- // Modify the send destination on the fly
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, RemotePort, RemoteIP));
-
- TEST_LOG("\nUse Wireshark and verify a correctly received DSCP mapping at"
- " the remote side!\n");
- TEST_LOG("Sending approx. 5 packets to %s:%d for each GQoS setting below:\n",
- RemoteIP, RemotePort);
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_BESTEFFORT));
- TEST_MUSTPASS(netw->GetSendGQoS(0, enabled, serviceType, overrideDSCP));
- TEST_LOG(" serviceType is set to SERVICETYPE_BESTEFFORT (0x%02x), should "
- "be mapped to DSCP = 0x00\n", serviceType);
- SleepMs(100);
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_CONTROLLEDLOAD));
- TEST_MUSTPASS(netw->GetSendGQoS(0, enabled, serviceType, overrideDSCP));
- TEST_LOG(" serviceType is set to SERVICETYPE_CONTROLLEDLOAD (0x%02x), "
- "should be mapped to DSCP = 0x18\n", serviceType);
- SleepMs(100);
- TEST_MUSTPASS(netw->SetSendGQoS(0, false, 0));
- TEST_LOG(" QoS is disabled, should give DSCP = 0x%02x\n", 0);
- SleepMs(100);
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_GUARANTEED));
- TEST_MUSTPASS(netw->GetSendGQoS(0, enabled, serviceType, overrideDSCP));
- TEST_LOG(" serviceType is set to SERVICETYPE_GUARANTEED (0x%02x), should "
- "be mapped to DSCP = 0x28\n", serviceType);
- SleepMs(100);
- TEST_MUSTPASS(netw->SetSendGQoS(0, false, 0));
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_QUALITATIVE));
- TEST_MUSTPASS(netw->GetSendGQoS(0, enabled, serviceType, overrideDSCP));
- TEST_LOG(" serviceType is set to SERVICETYPE_QUALITATIVE (0x%02x), should"
- " be mapped to DSCP = 0x00\n", serviceType);
- SleepMs(100);
-#endif // _SEND_TO_REMOTE_IP_
- TEST_MUSTPASS(voe_base_->StopReceive(0));
- TEST_MUSTPASS(voe_base_->StopSend(0));
-
- // STATE: sockets exists, sending side is initialized, no media
-
- // Repeat test above but this time using overrideDSCP.
-
- // Some initial loopack tests.
- // NOTE - override DSCP requres binding to local IP.
-
- // should not work since QoS is enabled
- TEST_MUSTPASS(!netw->SetSendGQoS(0, true, SERVICETYPE_BESTEFFORT, 3));
- MARK();
- TEST_ERROR(VE_TOS_GQOS_CONFLICT);
-
- // disble QoS and try to override again (should fail again since local
- // binding is not done yet)
- TEST_MUSTPASS(netw->SetSendGQoS(0, false, 0));
- TEST_MUSTPASS(!netw->SetSendGQoS(0, true, SERVICETYPE_BESTEFFORT, 3));
- MARK();
- TEST_ERROR(VE_GQOS_ERROR);
-
- // make proper settings and try again (should work this time)
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 12345, kVoEDefault, localIP));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, localIP));
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_BESTEFFORT, 3));
- MARK();
-
- // Now, let's try some loopback tests using override DSCP
-
- TEST_MUSTPASS(voe_base_->StartReceive(0));
- TEST_MUSTPASS(voe_base_->StartSend(0));
- ANL();
- TEST_LOG("[overrideDSCP=3]");
- Play(0, 2000, true, true); // file should be played out here...
-
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_BESTEFFORT, 17));
- MARK();
- ANL();
- TEST_LOG("[overrideDSCP=17]");
- Play(0, 2000, true, true); // file should be played out here...
-
- // And finally, send to remote side as well to verify that the new mapping
- // works as it should.
-
-#ifdef _SEND_TO_REMOTE_IP_
- // Modify the send destination on the fly
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, RemotePort, RemoteIP));
-
- TEST_LOG("\nUse Wireshark and verify a correctly received DSCP mapping at"
- " the remote side!\n");
- TEST_LOG("Sending approx. 5 packets to %s:%d for each GQoS setting below:\n",
- RemoteIP, RemotePort);
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_BESTEFFORT, 18));
- TEST_MUSTPASS(netw->GetSendGQoS(0, enabled, serviceType, overrideDSCP));
- TEST_LOG(" serviceType is set to SERVICETYPE_BESTEFFORT, should be "
- "overrided to DSCP = 0x%02x\n", overrideDSCP);
- SleepMs(100);
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_BESTEFFORT, 62));
- TEST_MUSTPASS(netw->GetSendGQoS(0, enabled, serviceType, overrideDSCP));
- TEST_LOG(" serviceType is set to SERVICETYPE_BESTEFFORT, should be "
- "overrided to DSCP = 0x%02x\n", overrideDSCP);
- SleepMs(100);
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_BESTEFFORT, 32));
- TEST_MUSTPASS(netw->GetSendGQoS(0, enabled, serviceType, overrideDSCP));
- TEST_LOG(" serviceType is set to SERVICETYPE_BESTEFFORT, should be "
- "overrided to DSCP = 0x%02x\n", overrideDSCP);
- SleepMs(100);
- TEST_MUSTPASS(netw->SetSendGQoS(0, true, SERVICETYPE_BESTEFFORT, 1));
- TEST_MUSTPASS(netw->GetSendGQoS(0, enabled, serviceType, overrideDSCP));
- TEST_LOG(" serviceType is set to SERVICETYPE_BESTEFFORT, should be "
- "overrided to DSCP = 0x%02x\n", overrideDSCP);
- SleepMs(100);
- TEST_MUSTPASS(netw->SetSendGQoS(0, false, 0));
- TEST_LOG(" QoS is disabled, should give DSCP = 0x%02x\n", 0);
- SleepMs(100);
-#endif // _SEND_TO_REMOTE_IP_
- TEST_MUSTPASS(voe_base_->StopReceive(0));
- TEST_MUSTPASS(voe_base_->StopSend(0));
-
- TEST_MUSTPASS(voe_base_->DeleteChannel(0));
- ANL(); AOK(); ANL(); ANL();
-
-#else
- TEST_LOG("Skipping GQoS tests - _WIN32 is not defined");
-#endif // #ifdef _WIN32
- // >> end of SetSendGQoS
- // ------------------------------------------------------------------------
-
- if (file) {
- file->StopPlayingFileAsMicrophone(0);
- }
- voe_base_->StopSend(0);
- voe_base_->StopPlayout(0);
- voe_base_->StopReceive(0);
- voe_base_->DeleteChannel(0);
- voe_base_->Terminate();
-
- ANL();
- AOK();
return 0;
}
+ // >> end of SetPacketTimeoutNotification
+ // ------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// VoEExtendedTest::TestRTP_RTCP
@@ -6460,8 +4859,7 @@
// Used to validate packets during the RTP audio level indication test.
class RTPAudioTransport: public Transport {
-public:
-
+ public:
RTPAudioTransport() :
mute_(false) {
}
@@ -6512,7 +4910,6 @@
assert(vad == 0 || vad == 1);
assert(level >= 0 && level <= 127);
}
-
return 0;
}
@@ -6521,7 +4918,7 @@
return 0;
}
-private:
+ private:
bool mute_;
};
@@ -6558,8 +4955,13 @@
TEST_MUSTPASS(voe_base_->Init());
TEST_MUSTPASS(voe_base_->CreateChannel());
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, "127.0.0.1"));
+
+ scoped_ptr<VoiceChannelTransport> voice_channel_transport(
+ new VoiceChannelTransport(network, 0));
+
+ voice_channel_transport->SetSendDestination("127.0.0.1", 12345);
+ voice_channel_transport->SetLocalReceiver(12345);
+
TEST_MUSTPASS(voe_base_->StartReceive(0));
TEST_MUSTPASS(voe_base_->StartSend(0));
TEST_MUSTPASS(voe_base_->StartPlayout(0));
@@ -6662,8 +5064,12 @@
TEST_MUSTPASS(voe_base_->DeleteChannel(1));
TEST_MUSTPASS(voe_base_->CreateChannel());
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, "127.0.0.1"));
+
+ voice_channel_transport.reset(new VoiceChannelTransport(network, 0));
+
+ voice_channel_transport->SetSendDestination("127.0.0.1", 12345);
+ voice_channel_transport->SetLocalReceiver(12345);
+
TEST_MUSTPASS(voe_base_->StartReceive(0));
TEST_MUSTPASS(voe_base_->StartSend(0));
TEST_MUSTPASS(voe_base_->StartPlayout(0));
@@ -6672,7 +5078,7 @@
ANL();
// ------------------------------------------------------------------------
- // >> InsertExtraRTPPacket
+ // >> SetLocalSSRC
int i(0);
@@ -6690,58 +5096,6 @@
true, true));
// ------------------------------------------------------------------------
- // >> InsertExtraRTPPacket
- TEST(InsertExtraRTPPacket);
- ANL();
-
- const char payloadData[8] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H' };
-
- TEST_MUSTPASS(-1 != rtp_rtcp->InsertExtraRTPPacket(-1, 0, false,
- payloadData, 8));
- MARK(); // invalid channel
- TEST_ERROR(VE_CHANNEL_NOT_VALID);
- TEST_MUSTPASS(-1 != rtp_rtcp->InsertExtraRTPPacket(0, -1, false,
- payloadData, 8));
- MARK(); // invalid payload type
- TEST_ERROR(VE_INVALID_PLTYPE);
- TEST_MUSTPASS(-1 != rtp_rtcp->InsertExtraRTPPacket(0, 128, false,
- payloadData, 8));
- MARK(); // invalid payload type
- TEST_ERROR(VE_INVALID_PLTYPE);
- TEST_MUSTPASS(-1 != rtp_rtcp->InsertExtraRTPPacket(0, 99, false,
- NULL, 8));
- MARK(); // invalid pointer
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(-1 != rtp_rtcp->InsertExtraRTPPacket(0, 99, false,
- payloadData, 1500-28+1));
- MARK(); // invalid size
- TEST_ERROR(VE_INVALID_ARGUMENT);
- TEST_MUSTPASS(voe_base_->StopSend(0));
- TEST_MUSTPASS(-1 != rtp_rtcp->InsertExtraRTPPacket(0, 99, false,
- payloadData, 8));
- MARK(); // not sending
- TEST_ERROR(VE_NOT_SENDING);
- TEST_MUSTPASS(voe_base_->StartSend(0));
- TEST_MUSTPASS(file->StartPlayingFileAsMicrophone(0, _mgr.AudioFilename(),
- true, true));
-
- SleepMs(1000);
- for (int p = 0; p < 128; p++) {
- TEST_MUSTPASS(rtp_rtcp->InsertExtraRTPPacket(0, p, false,
- payloadData, 8));
- MARK();
- TEST_MUSTPASS(rtp_rtcp->InsertExtraRTPPacket(0, p, true,
- payloadData, 8));
- MARK();
- }
-
- // Ensure we have sent all extra packets before we move forward to avoid
- //incorrect error code
- SleepMs(1000);
-
- ANL();
-
- // ------------------------------------------------------------------------
// >> RTP dump APIs
TEST(Start/StopRtpDump);
ANL();
@@ -6879,8 +5233,12 @@
SleepMs(100);
TEST_MUSTPASS(voe_base_->CreateChannel());
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, "127.0.0.1"));
+
+ voice_channel_transport.reset(new VoiceChannelTransport(network, 0));
+
+ voice_channel_transport->SetSendDestination("127.0.0.1", 12345);
+ voice_channel_transport->SetLocalReceiver(12345);
+
TEST_MUSTPASS(voe_base_->StartReceive(0));
TEST_MUSTPASS(voe_base_->StartSend(0));
TEST_MUSTPASS(voe_base_->StartPlayout(0));
@@ -7126,8 +5484,12 @@
// We have to re-register the audio codec payload type as stopReceive will
// clean the database
TEST_MUSTPASS(codec->SetRecPayloadType(0, cinst));
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 8000));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 8000, "127.0.0.1"));
+
+ voice_channel_transport.reset(new VoiceChannelTransport(network, 0));
+
+ voice_channel_transport->SetSendDestination("127.0.0.1", 8000);
+ voice_channel_transport->SetLocalReceiver(8000);
+
TEST_MUSTPASS(voe_base_->StartPlayout(0));
TEST_MUSTPASS(voe_base_->StartReceive(0));
TEST_MUSTPASS(voe_base_->StartSend(0));
@@ -7163,6 +5525,7 @@
VoEBase* voe_base_ = _mgr.BasePtr();
VoEVideoSync* vsync = _mgr.VideoSyncPtr();
+ VoENetwork* network = _mgr.NetworkPtr();
// check if this interface is supported
if (!vsync)
@@ -7186,8 +5549,13 @@
TEST_MUSTPASS(voe_base_->Init());
TEST_MUSTPASS(voe_base_->CreateChannel());
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, "127.0.0.1"));
+
+ scoped_ptr<VoiceChannelTransport> voice_channel_transport(
+ new VoiceChannelTransport(network, 0));
+
+ voice_channel_transport->SetSendDestination("127.0.0.1", 12345);
+ voice_channel_transport->SetLocalReceiver(12345);
+
TEST_MUSTPASS(voe_base_->StartReceive(0));
TEST_MUSTPASS(voe_base_->StartPlayout(0));
TEST_MUSTPASS(voe_base_->StartSend(0));
@@ -7265,6 +5633,7 @@
VoEBase* voe_base_ = _mgr.BasePtr();
VoEVolumeControl* volume = _mgr.VolumeControlPtr();
+ VoENetwork* network = _mgr.NetworkPtr();
#ifdef _TEST_FILE_
VoEFile* file = _mgr.FilePtr();
#endif
@@ -7296,8 +5665,10 @@
TEST_MUSTPASS(hardware->SetPlayoutDevice(0));
#endif
#endif
- TEST_MUSTPASS(voe_base_->SetLocalReceiver(0, 12345));
- TEST_MUSTPASS(voe_base_->SetSendDestination(0, 12345, "127.0.0.1"));
+ scoped_ptr<VoiceChannelTransport> voice_channel_transport(
+ new VoiceChannelTransport(network, 0));
+ voice_channel_transport->SetSendDestination("127.0.0.1", 12345);
+ voice_channel_transport->SetLocalReceiver(12345);
TEST_MUSTPASS(voe_base_->StartReceive(0));
TEST_MUSTPASS(voe_base_->StartPlayout(0));
TEST_MUSTPASS(voe_base_->StartSend(0));
diff --git a/webrtc/voice_engine/test/auto_test/voe_extended_test.h b/webrtc/voice_engine/test/auto_test/voe_extended_test.h
index c685d88..f784e96 100644
--- a/webrtc/voice_engine/test/auto_test/voe_extended_test.h
+++ b/webrtc/voice_engine/test/auto_test/voe_extended_test.h
@@ -12,7 +12,14 @@
#define WEBRTC_VOICE_ENGINE_VOE_EXTENDED_TEST_H
#include "voe_standard_test.h"
-#include "modules/audio_device/include/audio_device.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/ref_count.h"
+#include "webrtc/system_wrappers/interface/sleep.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/test/channel_transport/include/channel_transport.h"
namespace voetest {
@@ -425,35 +432,39 @@
int TestRTP_RTCP();
int TestVideoSync();
int TestVolumeControl();
- public:
+
int ErrorCode() const {
return _errCode;
}
void ClearErrorCode() {
_errCode = 0;
}
+
protected:
// from VoiceEngineObserver
void CallbackOnError(const int errCode, const int channel);
- void CallbackOnTrace(const TraceLevel level, const char* message, const int length);
- protected:
+ void CallbackOnTrace(const TraceLevel level, const char* message,
+ const int length);
+
// from VoEConnectionObserver
void OnPeriodicDeadOrAlive(const int channel, const bool alive);
+
private:
- void Play(int channel, unsigned int timeMillisec, bool addFileAsMicrophone = false,
- bool addTimeMarker = false);
+ void Play(int channel, unsigned int timeMillisec,
+ bool addFileAsMicrophone = false, bool addTimeMarker = false);
void Sleep(unsigned int timeMillisec, bool addMarker = false);
- void StartMedia(int channel, int rtpPort, bool listen, bool playout, bool send);
+ void StartMedia(int channel, int rtpPort, bool listen, bool playout,
+ bool send);
void StopMedia(int channel);
int RunMixingTest(int num_remote_channels, int num_local_channels,
int16_t input_value, int16_t max_output_value,
int16_t min_output_value);
- private:
+
VoETestManager& _mgr;
- private:
int _errCode;
bool _alive;
bool _listening[32];
+ scoped_ptr<webrtc::test::VoiceChannelTransport> voice_channel_transports_[32];
bool _playing[32];
bool _sending[32];
};
diff --git a/webrtc/voice_engine/test/auto_test/voe_stress_test.cc b/webrtc/voice_engine/test/auto_test/voe_stress_test.cc
index c921913..be8e42c 100644
--- a/webrtc/voice_engine/test/auto_test/voe_stress_test.cc
+++ b/webrtc/voice_engine/test/auto_test/voe_stress_test.cc
@@ -23,13 +23,16 @@
#endif
#include "webrtc/voice_engine/test/auto_test/voe_stress_test.h"
-#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/system_wrappers/interface/sleep.h"
#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/test/channel_transport/include/channel_transport.h"
+#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h"
#include "webrtc/voice_engine/voice_engine_defines.h" // defines build macros
using namespace webrtc;
+using namespace test;
namespace voetest {
@@ -122,6 +125,7 @@
// Get sub-API pointers
VoEBase* base = _mgr.BasePtr();
+ VoENetwork* voe_network = _mgr.NetworkPtr();
// Set trace
// VALIDATE_STRESS(base->SetTraceFileName(
@@ -147,9 +151,12 @@
printf("Test will take approximately %d minutes. \n",
numberOfLoops * loopSleep / 1000 / 60 + 1);
+ scoped_ptr<VoiceChannelTransport> voice_channel_transport(
+ new VoiceChannelTransport(voe_network, 0));
+
for (i = 0; i < numberOfLoops; ++i) {
- VALIDATE_STRESS(base->SetLocalReceiver(0, 4800));
- VALIDATE_STRESS(base->SetSendDestination(0, 4800, "127.0.0.1"));
+ voice_channel_transport->SetSendDestination("127.0.0.1", 4800);
+ voice_channel_transport->SetLocalReceiver(4800);
VALIDATE_STRESS(base->StartReceive(0));
VALIDATE_STRESS(base->StartPlayout(0));
VALIDATE_STRESS(base->StartSend(0));
@@ -162,8 +169,9 @@
}
ANL();
- VALIDATE_STRESS(base->SetLocalReceiver(0, 4800));
- VALIDATE_STRESS(base->SetSendDestination(0, 4800, "127.0.0.1"));
+ VALIDATE_STRESS(voice_channel_transport->SetSendDestination("127.0.0.1",
+ 4800));
+ VALIDATE_STRESS(voice_channel_transport->SetLocalReceiver(4800));
VALIDATE_STRESS(base->StartReceive(0));
VALIDATE_STRESS(base->StartPlayout(0));
VALIDATE_STRESS(base->StartSend(0));
diff --git a/webrtc/voice_engine/test/auto_test/voe_unit_test.cc b/webrtc/voice_engine/test/auto_test/voe_unit_test.cc
index b152aab..94656f5 100644
--- a/webrtc/voice_engine/test/auto_test/voe_unit_test.cc
+++ b/webrtc/voice_engine/test/auto_test/voe_unit_test.cc
@@ -25,6 +25,7 @@
#include "webrtc/voice_engine/test/auto_test/fakes/fake_media_process.h"
using namespace webrtc;
+using namespace test;
namespace voetest {
@@ -248,13 +249,17 @@
bool send, bool fileAsMic, bool localFile) {
VoEBase* base = _mgr.BasePtr();
VoEFile* file = _mgr.FilePtr();
+ VoENetwork* voe_network = _mgr.NetworkPtr();
_listening[channel] = false;
_playing[channel] = false;
_sending[channel] = false;
+ voice_channel_transports_[channel].reset(
+ new VoiceChannelTransport(voe_network, channel));
- CHECK(base->SetLocalReceiver(channel, rtpPort));
- CHECK(base->SetSendDestination(channel, rtpPort, "127.0.0.1"));
+ CHECK(voice_channel_transports_[channel]->SetLocalReceiver(rtpPort));
+ CHECK(voice_channel_transports_[channel]->SetSendDestination("127.0.0.1",
+ rtpPort));
if (listen) {
_listening[channel] = true;
CHECK(base->StartReceive(channel));
diff --git a/webrtc/voice_engine/test/auto_test/voe_unit_test.h b/webrtc/voice_engine/test/auto_test/voe_unit_test.h
index 346713a..69af78c 100644
--- a/webrtc/voice_engine/test/auto_test/voe_unit_test.h
+++ b/webrtc/voice_engine/test/auto_test/voe_unit_test.h
@@ -11,7 +11,9 @@
#ifndef WEBRTC_VOICE_ENGINE_VOE_UNIT_TEST_H
#define WEBRTC_VOICE_ENGINE_VOE_UNIT_TEST_H
-#include "voice_engine/test/auto_test/voe_standard_test.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/test/channel_transport/include/channel_transport.h"
+#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h"
namespace voetest {
@@ -57,6 +59,7 @@
bool _listening[32];
bool _playing[32];
bool _sending[32];
+ scoped_ptr<webrtc::test::VoiceChannelTransport> voice_channel_transports_[32];
private:
bool _extOnOff;
diff --git a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
index 2035e4e..96ebec9 100644
--- a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
+++ b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
@@ -18,8 +18,6 @@
#include <vector>
#include "gtest/gtest.h"
-#include "test/testsupport/fileutils.h"
-
#include "voe_errors.h"
#include "voe_base.h"
#include "voe_codec.h"
@@ -35,15 +33,17 @@
#include "voe_network.h"
#include "voe_neteq_stats.h"
#include "engine_configurations.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/test/channel_transport/include/channel_transport.h"
+#include "webrtc/test/testsupport/fileutils.h"
// Enable this this flag to run this test with hard coded
// IP/Port/codec and start test automatically with key input
// it could be useful in repeat tests.
//#define DEBUG
-// #define EXTERNAL_TRANSPORT
-
using namespace webrtc;
+using namespace test;
#define VALIDATE \
if (res != 0) \
@@ -70,29 +70,6 @@
void RunTest(std::string out_path);
-#ifdef EXTERNAL_TRANSPORT
-
-class my_transportation : public Transport
-{
- int SendPacket(int channel,const void *data,int len);
- int SendRTCPPacket(int channel, const void *data, int len);
-};
-
-int my_transportation::SendPacket(int channel,const void *data,int len)
-{
- netw->ReceivedRTPPacket(channel, data, len);
- return 0;
-}
-
-int my_transportation::SendRTCPPacket(int channel, const void *data, int len)
-{
- netw->ReceivedRTCPPacket(channel, data, len);
- return 0;
-}
-
-my_transportation my_transport;
-#endif
-
class MyObserver : public VoiceEngineObserver {
public:
virtual void CallbackOnError(const int channel, const int err_code);
@@ -270,44 +247,24 @@
cnt++;
int j = 0;
-#ifdef EXTERNAL_TRANSPORT
- my_transportation ch0transport;
- printf("Enabling external transport \n");
- netw->RegisterExternalTransport(0, ch0transport);
-#else
char ip[64];
#ifdef DEBUG
strcpy(ip, "127.0.0.1");
#else
- char localip[64];
- netw->GetLocalIP(localip);
- printf("local IP:%s\n", localip);
-
printf("1. 127.0.0.1 \n");
printf("2. Specify IP \n");
ASSERT_EQ(1, scanf("%i", &i));
- if (1 == i)
+ if (1 == i) {
strcpy(ip, "127.0.0.1");
- else {
+ } else {
printf("Specify remote IP: ");
ASSERT_EQ(1, scanf("%s", ip));
}
#endif
- int colons(0);
- while (ip[j] != '\0' && j < 64 && !(colons = (ip[j++] == ':')))
- ;
- if (colons) {
- printf("Enabling IPv6\n");
- res = netw->EnableIPv6(0);
- VALIDATE;
- }
-
- int rPort;
-#ifdef DEBUG
- rPort=8500;
-#else
+ int rPort = 8500;
+#ifndef DEBUG
printf("Specify remote port (1=1234): ");
ASSERT_EQ(1, scanf("%i", &rPort));
if (1 == rPort)
@@ -315,23 +272,24 @@
printf("Set Send port \n");
#endif
+ scoped_ptr<VoiceChannelTransport> voice_channel_transport(
+ new VoiceChannelTransport(netw, chan));
+
printf("Set Send IP \n");
- res = base1->SetSendDestination(chan, rPort, ip);
+ res = voice_channel_transport->SetSendDestination(ip, rPort);
VALIDATE;
- int lPort;
-#ifdef DEBUG
- lPort=8500;
-#else
+ int lPort = 8500;
+#ifndef DEBUG
printf("Specify local port (1=1234): ");
ASSERT_EQ(1, scanf("%i", &lPort));
if (1 == lPort)
lPort = 1234;
printf("Set Rec Port \n");
#endif
- res = base1->SetLocalReceiver(chan, lPort);
+
+ res = voice_channel_transport->SetLocalReceiver(lPort);
VALIDATE;
-#endif
printf("\n");
for (i = 0; i < codec->NumOfCodecs(); i++) {
@@ -367,12 +325,19 @@
#endif
int channel_index = 0;
std::vector<int> channels(kMaxNumChannels);
+ std::vector<scoped_ptr<VoiceChannelTransport> > voice_channel_transports;
+
for (i = 0; i < kMaxNumChannels; ++i) {
channels[i] = base1->CreateChannel();
int port = rPort + (i + 1) * 2;
- res = base1->SetSendDestination(channels[i], port, ip);
+
+ voice_channel_transports[i].reset(
+ new VoiceChannelTransport(netw, channels[i]));
+
+ printf("Set Send IP \n");
+ res = voice_channel_transports[i]->SetSendDestination(ip, port);
VALIDATE;
- res = base1->SetLocalReceiver(channels[i], port);
+ res = voice_channel_transports[i]->SetLocalReceiver(port);
VALIDATE;
res = codec->SetSendCodec(channels[i], cinst);
VALIDATE;
diff --git a/webrtc/voice_engine/test/voice_engine_tests.gypi b/webrtc/voice_engine/test/voice_engine_tests.gypi
index d02ef08..cb2c1d7 100644
--- a/webrtc/voice_engine/test/voice_engine_tests.gypi
+++ b/webrtc/voice_engine/test/voice_engine_tests.gypi
@@ -20,7 +20,8 @@
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/third_party/google-gflags/google-gflags.gyp:google-gflags',
'<(webrtc_root)/test/libtest/libtest.gyp:libtest',
- ],
+ '<(webrtc_root)/test/channel_transport.gyp:channel_transport',
+ ],
'include_dirs': [
'auto_test',
'auto_test/fixtures',
@@ -102,6 +103,7 @@
'<(DEPTH)/testing/gtest.gyp:gtest',
'voice_engine_core',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/test/channel_transport.gyp:channel_transport',
],
'sources': [
'cmd_test/voe_cmd_test.cc',