Update libjingle to CL 53398036.
Review URL: https://webrtc-codereview.appspot.com/2323004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4872 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/media/webrtc/webrtcvoiceengine_unittest.cc b/talk/media/webrtc/webrtcvoiceengine_unittest.cc
index 3710e7e..2b2d36a 100644
--- a/talk/media/webrtc/webrtcvoiceengine_unittest.cc
+++ b/talk/media/webrtc/webrtcvoiceengine_unittest.cc
@@ -2321,7 +2321,7 @@
// Nothing set, so all ignored.
cricket::AudioOptions options;
- ASSERT_TRUE(engine_.SetAudioOptions(options));
+ ASSERT_TRUE(engine_.SetOptions(options));
voe_.GetEcStatus(ec_enabled, ec_mode);
voe_.GetEcMetricsStatus(ec_metrics_enabled);
voe_.GetAecmMode(aecm_mode, cng_enabled);
@@ -2345,14 +2345,14 @@
// Turn echo cancellation off
options.echo_cancellation.Set(false);
- ASSERT_TRUE(engine_.SetAudioOptions(options));
+ ASSERT_TRUE(engine_.SetOptions(options));
voe_.GetEcStatus(ec_enabled, ec_mode);
EXPECT_FALSE(ec_enabled);
// Turn echo cancellation back on, with settings, and make sure
// nothing else changed.
options.echo_cancellation.Set(true);
- ASSERT_TRUE(engine_.SetAudioOptions(options));
+ ASSERT_TRUE(engine_.SetOptions(options));
voe_.GetEcStatus(ec_enabled, ec_mode);
voe_.GetEcMetricsStatus(ec_metrics_enabled);
voe_.GetAecmMode(aecm_mode, cng_enabled);
@@ -2375,14 +2375,14 @@
// Turn off AGC
options.auto_gain_control.Set(false);
- ASSERT_TRUE(engine_.SetAudioOptions(options));
+ ASSERT_TRUE(engine_.SetOptions(options));
voe_.GetAgcStatus(agc_enabled, agc_mode);
EXPECT_FALSE(agc_enabled);
// Turn AGC back on
options.auto_gain_control.Set(true);
options.adjust_agc_delta.Clear();
- ASSERT_TRUE(engine_.SetAudioOptions(options));
+ ASSERT_TRUE(engine_.SetOptions(options));
voe_.GetAgcStatus(agc_enabled, agc_mode);
EXPECT_TRUE(agc_enabled);
voe_.GetAgcConfig(agc_config);
@@ -2393,7 +2393,7 @@
options.highpass_filter.Set(false);
options.typing_detection.Set(false);
options.stereo_swapping.Set(true);
- ASSERT_TRUE(engine_.SetAudioOptions(options));
+ ASSERT_TRUE(engine_.SetOptions(options));
voe_.GetNsStatus(ns_enabled, ns_mode);
highpass_filter_enabled = voe_.IsHighPassFilterEnabled();
stereo_swapping_enabled = voe_.IsStereoChannelSwappingEnabled();
@@ -2405,7 +2405,7 @@
// Turn on "conference mode" to ensure it has no impact.
options.conference_mode.Set(true);
- ASSERT_TRUE(engine_.SetAudioOptions(options));
+ ASSERT_TRUE(engine_.SetOptions(options));
voe_.GetEcStatus(ec_enabled, ec_mode);
voe_.GetNsStatus(ns_enabled, ns_mode);
EXPECT_TRUE(ec_enabled);
@@ -2414,7 +2414,7 @@
EXPECT_EQ(webrtc::kNsHighSuppression, ns_mode);
}
-TEST_F(WebRtcVoiceEngineTestFake, SetOptions) {
+TEST_F(WebRtcVoiceEngineTestFake, DefaultOptions) {
EXPECT_TRUE(SetupEngine());
bool ec_enabled;
@@ -2428,103 +2428,6 @@
bool stereo_swapping_enabled;
bool typing_detection_enabled;
- ASSERT_TRUE(engine_.SetOptions(0));
- voe_.GetEcStatus(ec_enabled, ec_mode);
- voe_.GetEcMetricsStatus(ec_metrics_enabled);
- voe_.GetAgcStatus(agc_enabled, agc_mode);
- voe_.GetNsStatus(ns_enabled, ns_mode);
- highpass_filter_enabled = voe_.IsHighPassFilterEnabled();
- stereo_swapping_enabled = voe_.IsStereoChannelSwappingEnabled();
- voe_.GetTypingDetectionStatus(typing_detection_enabled);
- EXPECT_FALSE(ec_enabled);
- EXPECT_FALSE(agc_enabled);
- EXPECT_FALSE(ns_enabled);
- EXPECT_FALSE(highpass_filter_enabled);
- EXPECT_FALSE(stereo_swapping_enabled);
- EXPECT_TRUE(typing_detection_enabled);
-
- ASSERT_TRUE(engine_.SetOptions(
- cricket::MediaEngineInterface::ECHO_CANCELLATION));
- voe_.GetEcStatus(ec_enabled, ec_mode);
- voe_.GetEcMetricsStatus(ec_metrics_enabled);
- voe_.GetAgcStatus(agc_enabled, agc_mode);
- voe_.GetNsStatus(ns_enabled, ns_mode);
- highpass_filter_enabled = voe_.IsHighPassFilterEnabled();
- stereo_swapping_enabled = voe_.IsStereoChannelSwappingEnabled();
- voe_.GetTypingDetectionStatus(typing_detection_enabled);
- EXPECT_TRUE(ec_enabled);
- EXPECT_FALSE(agc_enabled);
- EXPECT_FALSE(ns_enabled);
- EXPECT_FALSE(highpass_filter_enabled);
- EXPECT_FALSE(stereo_swapping_enabled);
- EXPECT_TRUE(typing_detection_enabled);
-
- ASSERT_TRUE(engine_.SetOptions(
- cricket::MediaEngineInterface::AUTO_GAIN_CONTROL));
- voe_.GetEcStatus(ec_enabled, ec_mode);
- voe_.GetEcMetricsStatus(ec_metrics_enabled);
- voe_.GetAgcStatus(agc_enabled, agc_mode);
- voe_.GetNsStatus(ns_enabled, ns_mode);
- highpass_filter_enabled = voe_.IsHighPassFilterEnabled();
- stereo_swapping_enabled = voe_.IsStereoChannelSwappingEnabled();
- voe_.GetTypingDetectionStatus(typing_detection_enabled);
- EXPECT_FALSE(ec_enabled);
- EXPECT_TRUE(agc_enabled);
- EXPECT_FALSE(ns_enabled);
- EXPECT_FALSE(highpass_filter_enabled);
- EXPECT_FALSE(stereo_swapping_enabled);
- EXPECT_TRUE(typing_detection_enabled);
-
- ASSERT_TRUE(engine_.SetOptions(
- cricket::MediaEngineInterface::NOISE_SUPPRESSION));
- voe_.GetEcStatus(ec_enabled, ec_mode);
- voe_.GetEcMetricsStatus(ec_metrics_enabled);
- voe_.GetAgcStatus(agc_enabled, agc_mode);
- voe_.GetNsStatus(ns_enabled, ns_mode);
- highpass_filter_enabled = voe_.IsHighPassFilterEnabled();
- stereo_swapping_enabled = voe_.IsStereoChannelSwappingEnabled();
- voe_.GetTypingDetectionStatus(typing_detection_enabled);
- EXPECT_FALSE(ec_enabled);
- EXPECT_FALSE(agc_enabled);
- EXPECT_TRUE(ns_enabled);
- EXPECT_FALSE(highpass_filter_enabled);
- EXPECT_FALSE(stereo_swapping_enabled);
- EXPECT_TRUE(typing_detection_enabled);
-
- ASSERT_TRUE(engine_.SetOptions(
- cricket::MediaEngineInterface::HIGHPASS_FILTER));
- voe_.GetEcStatus(ec_enabled, ec_mode);
- voe_.GetEcMetricsStatus(ec_metrics_enabled);
- voe_.GetAgcStatus(agc_enabled, agc_mode);
- voe_.GetNsStatus(ns_enabled, ns_mode);
- highpass_filter_enabled = voe_.IsHighPassFilterEnabled();
- stereo_swapping_enabled = voe_.IsStereoChannelSwappingEnabled();
- voe_.GetTypingDetectionStatus(typing_detection_enabled);
- EXPECT_FALSE(ec_enabled);
- EXPECT_FALSE(agc_enabled);
- EXPECT_FALSE(ns_enabled);
- EXPECT_TRUE(highpass_filter_enabled);
- EXPECT_FALSE(stereo_swapping_enabled);
- EXPECT_TRUE(typing_detection_enabled);
-
- ASSERT_TRUE(engine_.SetOptions(
- cricket::MediaEngineInterface::STEREO_FLIPPING));
- voe_.GetEcStatus(ec_enabled, ec_mode);
- voe_.GetEcMetricsStatus(ec_metrics_enabled);
- voe_.GetAgcStatus(agc_enabled, agc_mode);
- voe_.GetNsStatus(ns_enabled, ns_mode);
- highpass_filter_enabled = voe_.IsHighPassFilterEnabled();
- stereo_swapping_enabled = voe_.IsStereoChannelSwappingEnabled();
- voe_.GetTypingDetectionStatus(typing_detection_enabled);
- EXPECT_FALSE(ec_enabled);
- EXPECT_FALSE(agc_enabled);
- EXPECT_FALSE(ns_enabled);
- EXPECT_FALSE(highpass_filter_enabled);
- EXPECT_TRUE(stereo_swapping_enabled);
- EXPECT_TRUE(typing_detection_enabled);
-
- ASSERT_TRUE(engine_.SetOptions(
- cricket::MediaEngineInterface::DEFAULT_AUDIO_OPTIONS));
voe_.GetEcStatus(ec_enabled, ec_mode);
voe_.GetEcMetricsStatus(ec_metrics_enabled);
voe_.GetAgcStatus(agc_enabled, agc_mode);
@@ -2536,24 +2439,8 @@
EXPECT_TRUE(agc_enabled);
EXPECT_TRUE(ns_enabled);
EXPECT_TRUE(highpass_filter_enabled);
+ EXPECT_TRUE(typing_detection_enabled);
EXPECT_FALSE(stereo_swapping_enabled);
- EXPECT_TRUE(typing_detection_enabled);
-
- ASSERT_TRUE(engine_.SetOptions(
- cricket::MediaEngineInterface::ALL_AUDIO_OPTIONS));
- voe_.GetEcStatus(ec_enabled, ec_mode);
- voe_.GetEcMetricsStatus(ec_metrics_enabled);
- voe_.GetAgcStatus(agc_enabled, agc_mode);
- voe_.GetNsStatus(ns_enabled, ns_mode);
- highpass_filter_enabled = voe_.IsHighPassFilterEnabled();
- stereo_swapping_enabled = voe_.IsStereoChannelSwappingEnabled();
- voe_.GetTypingDetectionStatus(typing_detection_enabled);
- EXPECT_TRUE(ec_enabled);
- EXPECT_TRUE(agc_enabled);
- EXPECT_TRUE(ns_enabled);
- EXPECT_TRUE(highpass_filter_enabled);
- EXPECT_TRUE(stereo_swapping_enabled);
- EXPECT_TRUE(typing_detection_enabled);
}
TEST_F(WebRtcVoiceEngineTestFake, InitDoesNotOverwriteDefaultAgcConfig) {
@@ -2625,7 +2512,7 @@
ASSERT_TRUE(channel2->GetOptions(&actual_options));
EXPECT_EQ(expected_options, actual_options);
- ASSERT_TRUE(engine_.SetAudioOptions(options_all));
+ ASSERT_TRUE(engine_.SetOptions(options_all));
bool ec_enabled;
webrtc::EcModes ec_mode;
bool agc_enabled;
@@ -2672,7 +2559,7 @@
EXPECT_TRUE(ns_enabled);
// Make sure settings take effect while we are sending.
- ASSERT_TRUE(engine_.SetAudioOptions(options_all));
+ ASSERT_TRUE(engine_.SetOptions(options_all));
cricket::AudioOptions options_no_agc_nor_ns;
options_no_agc_nor_ns.auto_gain_control.Set(false);
options_no_agc_nor_ns.noise_suppression.Set(false);