generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set SingleStream BWE in unittests.

Browse Source 
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
This commit is contained in:
stefan@webrtc.org
2013-02-11 08:30:23 +00:00
parent 63066f7200
commit 0cb48a0a18
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc
View File

@@ -64,7 +64,7 @@ class RtcpFormatRembTest : public ::testing::Test {
remote_bitrate_observer_(), remote_bitrate_observer_(),
remote_bitrate_estimator_(RemoteBitrateEstimator::Create( remote_bitrate_estimator_(RemoteBitrateEstimator::Create(
over_use_detector_options_, over_use_detector_options_,
RemoteBitrateEstimator::kMultiStreamEstimation, RemoteBitrateEstimator::kSingleStreamEstimation,
&remote_bitrate_observer_, &remote_bitrate_observer_,
system_clock_)) {} system_clock_)) {}
virtual void SetUp(); virtual void SetUp();

2
webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
View File

@@ -173,7 +173,7 @@ class RtcpReceiverTest : public ::testing::Test {
remote_bitrate_estimator_( remote_bitrate_estimator_(
RemoteBitrateEstimator::Create( RemoteBitrateEstimator::Create(
over_use_detector_options_, over_use_detector_options_,
RemoteBitrateEstimator::kMultiStreamEstimation, RemoteBitrateEstimator::kSingleStreamEstimation,
&remote_bitrate_observer_, &remote_bitrate_observer_,
&system_clock_)) { &system_clock_)) {
test_transport_ = new TestTransport(); test_transport_ = new TestTransport();

2
webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
View File

@@ -124,7 +124,7 @@ class RtcpSenderTest : public ::testing::Test {
remote_bitrate_estimator_( remote_bitrate_estimator_(
RemoteBitrateEstimator::Create( RemoteBitrateEstimator::Create(
over_use_detector_options_, over_use_detector_options_,
RemoteBitrateEstimator::kMultiStreamEstimation, RemoteBitrateEstimator::kSingleStreamEstimation,
&remote_bitrate_observer_, &remote_bitrate_observer_,
system_clock_)) { system_clock_)) {
test_transport_ = new TestTransport(); test_transport_ = new TestTransport();

12
webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc
View File

@@ -97,8 +97,8 @@ int VideoEngineSampleCode(void* window1, void* window2)
} }
printf("Bandwidth estimation modes:\n"); printf("Bandwidth estimation modes:\n");
printf("1. Multi-stream bandwidth estimation\n"); printf("1. Single-stream bandwidth estimation\n");
printf("2. Single-stream bandwidth estimation\n"); printf("2. Multi-stream bandwidth estimation\n");
printf("Choose bandwidth estimation mode (default is 1): "); printf("Choose bandwidth estimation mode (default is 1): ");
std::string str; std::string str;
std::getline(std::cin, str); std::getline(std::cin, str);
@@ -106,14 +106,14 @@ int VideoEngineSampleCode(void* window1, void* window2)
webrtc::BandwidthEstimationMode bwe_mode; webrtc::BandwidthEstimationMode bwe_mode;
switch (bwe_mode_choice) { switch (bwe_mode_choice) {
case 1: case 1:
bwe_mode = webrtc::kViEMultiStreamEstimation;
break;
case 2:
bwe_mode = webrtc::kViESingleStreamEstimation; bwe_mode = webrtc::kViESingleStreamEstimation;
break; break;
default: case 2:
bwe_mode = webrtc::kViEMultiStreamEstimation; bwe_mode = webrtc::kViEMultiStreamEstimation;
break; break;
default:
bwe_mode = webrtc::kViESingleStreamEstimation;
break;
} }
error = ptrViERtpRtcp->SetBandwidthEstimationMode(bwe_mode); error = ptrViERtpRtcp->SetBandwidthEstimationMode(bwe_mode);

12
webrtc/video_engine/test/auto_test/source/vie_autotest_simulcast.cc
View File

@@ -134,8 +134,8 @@ int VideoEngineSimulcastTest(void* window1, void* window2) {
} }
printf("Bandwidth estimation modes:\n"); printf("Bandwidth estimation modes:\n");
printf("1. Multi-stream bandwidth estimation\n"); printf("1. Single-stream bandwidth estimation\n");
printf("2. Single-stream bandwidth estimation\n"); printf("2. Multi-stream bandwidth estimation\n");
printf("Choose bandwidth estimation mode (default is 1): "); printf("Choose bandwidth estimation mode (default is 1): ");
std::string str; std::string str;
std::getline(std::cin, str); std::getline(std::cin, str);
@@ -143,14 +143,14 @@ int VideoEngineSimulcastTest(void* window1, void* window2) {
webrtc::BandwidthEstimationMode bwe_mode; webrtc::BandwidthEstimationMode bwe_mode;
switch (bwe_mode_choice) { switch (bwe_mode_choice) {
case 1: case 1:
bwe_mode = webrtc::kViEMultiStreamEstimation;
break;
case 2:
bwe_mode = webrtc::kViESingleStreamEstimation; bwe_mode = webrtc::kViESingleStreamEstimation;
break; break;
default: case 2:
bwe_mode = webrtc::kViEMultiStreamEstimation; bwe_mode = webrtc::kViEMultiStreamEstimation;
break; break;
default:
bwe_mode = webrtc::kViESingleStreamEstimation;
break;
} }
error = vie_rtp_rtcp->SetBandwidthEstimationMode(bwe_mode); error = vie_rtp_rtcp->SetBandwidthEstimationMode(bwe_mode);