Enable pacing by default and remove the option to disable it from the new API.

BUG=1672
R=mflodman@webrtc.org, pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/17659004

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6416 4adac7df-926f-26a2-2b94-8c16560cd09d

5 files changed, 11 insertions, 6 deletions

diff --git a/video_engine/test/auto_test/primitives/base_primitives.cc b/video_engine/test/auto_test/primitives/base_primitives.cc
index 4b464503..32f4b210 100644
--- a/video_engine/test/auto_test/primitives/base_primitives.cc
+++ b/video_engine/test/auto_test/primitives/base_primitives.cc
@@ -43,10 +43,13 @@ void TestI420CallSetup(webrtc::ViECodec* codec_interface,
                        webrtc::VideoEngine* video_engine,
                        webrtc::ViEBase* base_interface,
                        webrtc::ViENetwork* network_interface,
+                       webrtc::ViERTP_RTCP* rtp_rtcp_interface,
                        int video_channel,
                        const char* device_name) {
   webrtc::VideoCodec video_codec;
   memset(&video_codec, 0, sizeof(webrtc::VideoCodec));
+  EXPECT_EQ(0, rtp_rtcp_interface->SetTransmissionSmoothingStatus(video_channel,
+                                                                  false));
 
   ConfigureCodecsToI420(video_channel, video_codec, codec_interface);
 
diff --git a/video_engine/test/auto_test/primitives/base_primitives.h b/video_engine/test/auto_test/primitives/base_primitives.h
index 13f7928f..95687174 100644
--- a/video_engine/test/auto_test/primitives/base_primitives.h
+++ b/video_engine/test/auto_test/primitives/base_primitives.h
@@ -16,6 +16,7 @@ class VideoEngine;
 class ViEBase;
 class ViECodec;
 class ViENetwork;
+class ViERTP_RTCP;
 }
 
 // Tests a I420-to-I420 call. This test exercises the most basic WebRTC
@@ -26,6 +27,7 @@ void TestI420CallSetup(webrtc::ViECodec* codec_interface,
                        webrtc::VideoEngine* video_engine,
                        webrtc::ViEBase* base_interface,
                        webrtc::ViENetwork* network_interface,
+                       webrtc::ViERTP_RTCP* rtp_rtcp_interface,
                        int video_channel,
                        const char* device_name);
 
diff --git a/video_engine/test/auto_test/source/vie_autotest_base.cc b/video_engine/test/auto_test/source/vie_autotest_base.cc
index 84da2229..4d032ef5 100644
--- a/video_engine/test/auto_test/source/vie_autotest_base.cc
+++ b/video_engine/test/auto_test/source/vie_autotest_base.cc
@@ -67,8 +67,8 @@ void ViEAutoTest::ViEBaseStandardTest() {
   ViETest::Log("You should shortly see a local preview from camera %s"
                " in window 1 and the remote video in window 2.", device_name);
   ::TestI420CallSetup(interfaces.codec, interfaces.video_engine,
-                      base_interface, interfaces.network, video_channel,
-                      device_name);
+                      base_interface, interfaces.network, interfaces.rtp_rtcp,
+                      video_channel, device_name);
 
   // ***************************************************************
   // Testing finished. Tear down Video Engine
diff --git a/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc b/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
index 05540bc6..671e727c 100644
--- a/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
+++ b/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
@@ -179,8 +179,6 @@ void ViEAutoTest::ViERtpRtcpStandardTest()
     myTransport.ClearStats();
 
     EXPECT_EQ(0, ViE.rtp_rtcp->SetNACKStatus(tbChannel.videoChannel, true));
-    EXPECT_EQ(0, ViE.rtp_rtcp->SetTransmissionSmoothingStatus(
-        tbChannel.videoChannel, true));
     EXPECT_EQ(0, ViE.base->StartReceive(tbChannel.videoChannel));
     EXPECT_EQ(0, ViE.base->StartSend(tbChannel.videoChannel));
 
@@ -220,6 +218,7 @@ void ViEAutoTest::ViERtpRtcpStandardTest()
     myTransport.ClearStats();
 
     const uint8_t kRtxPayloadType = 96;
+    // Temporarily disable pacing.
     EXPECT_EQ(0, ViE.rtp_rtcp->SetTransmissionSmoothingStatus(
         tbChannel.videoChannel, false));
     EXPECT_EQ(0, ViE.rtp_rtcp->SetNACKStatus(tbChannel.videoChannel, true));
@@ -523,6 +522,7 @@ void ViEAutoTest::ViERtpRtcpStandardTest()
     ViETest::Log("Testing Network Down...\n");
 
     EXPECT_EQ(0, ViE.rtp_rtcp->SetNACKStatus(tbChannel.videoChannel, true));
+    // Reenable pacing.
     EXPECT_EQ(0, ViE.rtp_rtcp->SetTransmissionSmoothingStatus(
         tbChannel.videoChannel, true));
 
diff --git a/video_engine/test/auto_test/source/vie_file_based_comparison_tests.cc b/video_engine/test/auto_test/source/vie_file_based_comparison_tests.cc
index f6c10002..4f3a90a7 100644
--- a/video_engine/test/auto_test/source/vie_file_based_comparison_tests.cc
+++ b/video_engine/test/auto_test/source/vie_file_based_comparison_tests.cc
@@ -66,8 +66,8 @@ bool ViEFileBasedComparisonTests::TestCallSetup(
   const char* device_name = "Fake Capture Device";
 
   ::TestI420CallSetup(interfaces.codec, interfaces.video_engine,
-                      interfaces.base, interfaces.network, video_channel,
-                      device_name);
+                      interfaces.base, interfaces.network, interfaces.rtp_rtcp,
+                      video_channel, device_name);
 
   EXPECT_EQ(0, render_interface->StopRender(video_channel));
   EXPECT_EQ(0, render_interface->RemoveRenderer(video_channel));