From 0cb48a0a18a5fa40107b83c147101c9cef85e116 Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Mon, 11 Feb 2013 08:30:23 +0000 Subject: [PATCH] Set SingleStream BWE in unittests. TEST=trybots Review URL: https://webrtc-codereview.appspot.com/1094004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3494 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../rtp_rtcp/source/rtcp_format_remb_unittest.cc | 2 +- .../rtp_rtcp/source/rtcp_receiver_unittest.cc | 2 +- .../modules/rtp_rtcp/source/rtcp_sender_unittest.cc | 2 +- .../test/auto_test/source/vie_autotest_loopback.cc | 12 ++++++------ .../test/auto_test/source/vie_autotest_simulcast.cc | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc index 5340ed2c8..cdf334d70 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc @@ -64,7 +64,7 @@ class RtcpFormatRembTest : public ::testing::Test { remote_bitrate_observer_(), remote_bitrate_estimator_(RemoteBitrateEstimator::Create( over_use_detector_options_, - RemoteBitrateEstimator::kMultiStreamEstimation, + RemoteBitrateEstimator::kSingleStreamEstimation, &remote_bitrate_observer_, system_clock_)) {} virtual void SetUp(); diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc index ad4b9090d..6de259014 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc @@ -173,7 +173,7 @@ class RtcpReceiverTest : public ::testing::Test { remote_bitrate_estimator_( RemoteBitrateEstimator::Create( over_use_detector_options_, - RemoteBitrateEstimator::kMultiStreamEstimation, + RemoteBitrateEstimator::kSingleStreamEstimation, &remote_bitrate_observer_, &system_clock_)) { test_transport_ = new TestTransport(); diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc index 89f42792a..6f8f2c6de 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc @@ -124,7 +124,7 @@ class RtcpSenderTest : public ::testing::Test { remote_bitrate_estimator_( RemoteBitrateEstimator::Create( over_use_detector_options_, - RemoteBitrateEstimator::kMultiStreamEstimation, + RemoteBitrateEstimator::kSingleStreamEstimation, &remote_bitrate_observer_, system_clock_)) { test_transport_ = new TestTransport(); 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 ba1648fae..5320db22a 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 @@ -97,8 +97,8 @@ int VideoEngineSampleCode(void* window1, void* window2) } printf("Bandwidth estimation modes:\n"); - printf("1. Multi-stream bandwidth estimation\n"); - printf("2. Single-stream bandwidth estimation\n"); + printf("1. Single-stream bandwidth estimation\n"); + printf("2. Multi-stream bandwidth estimation\n"); printf("Choose bandwidth estimation mode (default is 1): "); std::string str; std::getline(std::cin, str); @@ -106,14 +106,14 @@ int VideoEngineSampleCode(void* window1, void* window2) webrtc::BandwidthEstimationMode bwe_mode; switch (bwe_mode_choice) { case 1: - bwe_mode = webrtc::kViEMultiStreamEstimation; - break; - case 2: bwe_mode = webrtc::kViESingleStreamEstimation; break; - default: + case 2: bwe_mode = webrtc::kViEMultiStreamEstimation; break; + default: + bwe_mode = webrtc::kViESingleStreamEstimation; + break; } error = ptrViERtpRtcp->SetBandwidthEstimationMode(bwe_mode); 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 516088aaa..1af7a6dec 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 @@ -134,8 +134,8 @@ int VideoEngineSimulcastTest(void* window1, void* window2) { } printf("Bandwidth estimation modes:\n"); - printf("1. Multi-stream bandwidth estimation\n"); - printf("2. Single-stream bandwidth estimation\n"); + printf("1. Single-stream bandwidth estimation\n"); + printf("2. Multi-stream bandwidth estimation\n"); printf("Choose bandwidth estimation mode (default is 1): "); std::string str; std::getline(std::cin, str); @@ -143,14 +143,14 @@ int VideoEngineSimulcastTest(void* window1, void* window2) { webrtc::BandwidthEstimationMode bwe_mode; switch (bwe_mode_choice) { case 1: - bwe_mode = webrtc::kViEMultiStreamEstimation; - break; - case 2: bwe_mode = webrtc::kViESingleStreamEstimation; break; - default: + case 2: bwe_mode = webrtc::kViEMultiStreamEstimation; break; + default: + bwe_mode = webrtc::kViESingleStreamEstimation; + break; } error = vie_rtp_rtcp->SetBandwidthEstimationMode(bwe_mode);