From 0b18fb38e622c32aeec66f121c2ac0dfd7d65996 Mon Sep 17 00:00:00 2001 From: "mikhal@webrtc.org" Date: Tue, 18 Dec 2012 19:47:52 +0000 Subject: [PATCH] vie auto test: Adding a constructor for NetworkParameters BUG= Review URL: https://webrtc-codereview.appspot.com/995013 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3310 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../test/auto_test/source/vie_autotest_loopback.cc | 4 +++- .../test/auto_test/source/vie_autotest_rtp_rtcp.cc | 4 +++- .../test/auto_test/source/vie_autotest_simulcast.cc | 5 ++++- .../test/libvietest/include/tb_external_transport.h | 3 +++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc index c661b894a9..ba1648faec 100644 --- a/webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc +++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc @@ -492,7 +492,9 @@ int VideoEngineSampleCode(void* window1, void* window2) return -1; } - NetworkParameters network = {0, 0, 0}; + // Setting uniform loss. Actual values will be set by user. + NetworkParameters network; + network.loss_model = kUniformLoss; // Set up packet loss value std::cout << "Enter Packet Loss Percentage" << std::endl; std::string rate_str; diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc index 085ce5fd4e..d8bf8aa901 100644 --- a/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc +++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc @@ -165,7 +165,9 @@ void ViEAutoTest::ViERtpRtcpStandardTest() myTransport.ClearStats(); const int kPacketLossRate = 20; - NetworkParameters network = {kPacketLossRate, 0, 0}; // 20% packet loss. + NetworkParameters network; + network.packet_loss_rate = kPacketLossRate; + network.loss_model = kUniformLoss; myTransport.SetNetworkParameters(network); // Start send to verify sending stats diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_simulcast.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_simulcast.cc index 4b5d4d1f31..516088aaa2 100644 --- a/webrtc/video_engine/test/auto_test/source/vie_autotest_simulcast.cc +++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_simulcast.cc @@ -438,7 +438,10 @@ int VideoEngineSimulcastTest(void* window1, void* window2) { } // Set network one-way delay value. - NetworkParameters network = {0, 10, 0}; // 10 ms one-way delay. + // 10 ms one-way delay. + NetworkParameters network; + network.loss_model = kUniformLoss; + network.mean_one_way_delay = 10; ext_transport.SetNetworkParameters(network); if (relay_mode == kRelayOneStream) { diff --git a/webrtc/video_engine/test/libvietest/include/tb_external_transport.h b/webrtc/video_engine/test/libvietest/include/tb_external_transport.h index 1724e64c37..6e49853286 100644 --- a/webrtc/video_engine/test/libvietest/include/tb_external_transport.h +++ b/webrtc/video_engine/test/libvietest/include/tb_external_transport.h @@ -39,6 +39,9 @@ struct NetworkParameters { int mean_one_way_delay; int std_dev_one_way_delay; RandomLossModel loss_model; + NetworkParameters(): + packet_loss_rate(0), burst_length(0), mean_one_way_delay(0), + std_dev_one_way_delay(0), loss_model(kNoLoss) {} }; // Allows to subscribe for callback when a frame is started being sent.