diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc index 4f310d36e2..56a2d6c54a 100644 --- a/webrtc/voice_engine/channel.cc +++ b/webrtc/voice_engine/channel.cc @@ -879,7 +879,6 @@ Channel::Channel(int32_t channelId, _voiceEngineObserverPtr(NULL), _callbackCritSectPtr(NULL), _transportPtr(NULL), - rx_audioproc_(AudioProcessing::Create(VoEModuleId(instanceId, channelId))), _rxVadObserverPtr(NULL), _oldVadDecision(-1), _sendFrameType(0), @@ -937,6 +936,10 @@ Channel::Channel(int32_t channelId, statistics_proxy_.reset(new StatisticsProxy(_rtpRtcpModule->SSRC())); rtp_receive_statistics_->RegisterRtcpStatisticsCallback( statistics_proxy_.get()); + + Config audioproc_config; + audioproc_config.Set(new ExperimentalAgc(false)); + rx_audioproc_.reset(AudioProcessing::Create(audioproc_config)); } Channel::~Channel() diff --git a/webrtc/voice_engine/test/auto_test/extended/agc_config_test.cc b/webrtc/voice_engine/test/auto_test/extended/agc_config_test.cc index c706cb738a..384fa1e9c3 100644 --- a/webrtc/voice_engine/test/auto_test/extended/agc_config_test.cc +++ b/webrtc/voice_engine/test/auto_test/extended/agc_config_test.cc @@ -22,9 +22,7 @@ class AgcConfigTest : public AfterStreamingFixture { webrtc::AgcConfig default_agc_config_; }; -// TODO(aluebs): Re-enable tests in agc_config_test and audio_processing_test -// when possible. Bug: issue 2784. -TEST_F(AgcConfigTest, DISABLED_HasCorrectDefaultConfiguration) { +TEST_F(AgcConfigTest, HasCorrectDefaultConfiguration) { webrtc::AgcConfig agc_config; EXPECT_EQ(0, voe_apm_->GetAgcConfig(agc_config)); @@ -35,7 +33,7 @@ TEST_F(AgcConfigTest, DISABLED_HasCorrectDefaultConfiguration) { EXPECT_EQ(default_agc_config_.limiterEnable, agc_config.limiterEnable); } -TEST_F(AgcConfigTest, DISABLED_DealsWithInvalidParameters) { +TEST_F(AgcConfigTest, DealsWithInvalidParameters) { webrtc::AgcConfig agc_config = default_agc_config_; agc_config.digitalCompressionGaindB = 91; EXPECT_EQ(-1, voe_apm_->SetAgcConfig(agc_config)) << "Should not be able " @@ -49,7 +47,7 @@ TEST_F(AgcConfigTest, DISABLED_DealsWithInvalidParameters) { EXPECT_EQ(VE_APM_ERROR, voe_base_->LastError()); } -TEST_F(AgcConfigTest, DISABLED_CanGetAndSetAgcStatus) { +TEST_F(AgcConfigTest, CanGetAndSetAgcStatus) { webrtc::AgcConfig agc_config; agc_config.digitalCompressionGaindB = 17; agc_config.targetLeveldBOv = 11; @@ -67,7 +65,7 @@ TEST_F(AgcConfigTest, DISABLED_CanGetAndSetAgcStatus) { actual_config.targetLeveldBOv); } -TEST_F(AgcConfigTest, DISABLED_HasCorrectDefaultRxConfiguration) { +TEST_F(AgcConfigTest, HasCorrectDefaultRxConfiguration) { webrtc::AgcConfig agc_config; EXPECT_EQ(0, voe_apm_->GetRxAgcConfig(channel_, agc_config)); @@ -78,7 +76,7 @@ TEST_F(AgcConfigTest, DISABLED_HasCorrectDefaultRxConfiguration) { EXPECT_EQ(default_agc_config_.limiterEnable, agc_config.limiterEnable); } -TEST_F(AgcConfigTest, DISABLED_DealsWithInvalidRxParameters) { +TEST_F(AgcConfigTest, DealsWithInvalidRxParameters) { webrtc::AgcConfig agc_config = default_agc_config_; agc_config.digitalCompressionGaindB = 91; EXPECT_EQ(-1, voe_apm_->SetRxAgcConfig(channel_, agc_config)) << @@ -92,7 +90,7 @@ TEST_F(AgcConfigTest, DISABLED_DealsWithInvalidRxParameters) { EXPECT_EQ(VE_APM_ERROR, voe_base_->LastError()); } -TEST_F(AgcConfigTest, DISABLED_CanGetAndSetRxAgcStatus) { +TEST_F(AgcConfigTest, CanGetAndSetRxAgcStatus) { webrtc::AgcConfig agc_config; agc_config.digitalCompressionGaindB = 17; agc_config.targetLeveldBOv = 11; diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc index ede8b0d35a..c54d289cac 100644 --- a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc +++ b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc @@ -8,6 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" class TestErrorObserver : public webrtc::VoiceEngineObserver { @@ -22,7 +23,11 @@ class TestErrorObserver : public webrtc::VoiceEngineObserver { AfterInitializationFixture::AfterInitializationFixture() : error_observer_(new TestErrorObserver()) { - EXPECT_EQ(0, voe_base_->Init()); + webrtc::Config config; + config.Set(new webrtc::ExperimentalAgc(false)); + webrtc::AudioProcessing* audioproc = webrtc::AudioProcessing::Create(config); + + EXPECT_EQ(0, voe_base_->Init(NULL, audioproc)); #if defined(WEBRTC_ANDROID) EXPECT_EQ(0, voe_hardware_->SetLoudspeakerStatus(false)); diff --git a/webrtc/voice_engine/test/auto_test/standard/audio_processing_test.cc b/webrtc/voice_engine/test/auto_test/standard/audio_processing_test.cc index 928387fd85..132caa3e91 100644 --- a/webrtc/voice_engine/test/auto_test/standard/audio_processing_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/audio_processing_test.cc @@ -140,7 +140,7 @@ class AudioProcessingTest : public AfterStreamingFixture { #if !defined(WEBRTC_IOS) && !defined(WEBRTC_ANDROID) -TEST_F(AudioProcessingTest, DISABLED_AgcIsOnByDefault) { +TEST_F(AudioProcessingTest, AgcIsOnByDefault) { bool agc_enabled = false; webrtc::AgcModes agc_mode = webrtc::kAgcAdaptiveAnalog; @@ -149,7 +149,7 @@ TEST_F(AudioProcessingTest, DISABLED_AgcIsOnByDefault) { EXPECT_EQ(webrtc::kAgcAdaptiveAnalog, agc_mode); } -TEST_F(AudioProcessingTest, DISABLED_CanEnableAgcWithAllModes) { +TEST_F(AudioProcessingTest, CanEnableAgcWithAllModes) { TryEnablingAgcWithMode(webrtc::kAgcAdaptiveDigital); TryEnablingAgcWithMode(webrtc::kAgcAdaptiveAnalog); TryEnablingAgcWithMode(webrtc::kAgcFixedDigital); @@ -248,7 +248,7 @@ TEST_F(AudioProcessingTest, CanSetAecmMode) { TryEnablingAecmWithMode(webrtc::kAecmSpeakerphone, false); } -TEST_F(AudioProcessingTest, DISABLED_RxAgcShouldBeOffByDefault) { +TEST_F(AudioProcessingTest, RxAgcShouldBeOffByDefault) { bool rx_agc_enabled = true; webrtc::AgcModes agc_mode = webrtc::kAgcDefault; @@ -257,12 +257,12 @@ TEST_F(AudioProcessingTest, DISABLED_RxAgcShouldBeOffByDefault) { EXPECT_EQ(webrtc::kAgcAdaptiveDigital, agc_mode); } -TEST_F(AudioProcessingTest, DISABLED_CanTurnOnDigitalRxAcg) { +TEST_F(AudioProcessingTest, CanTurnOnDigitalRxAcg) { TryEnablingRxAgcWithMode(webrtc::kAgcAdaptiveDigital); TryEnablingRxAgcWithMode(webrtc::kAgcFixedDigital); } -TEST_F(AudioProcessingTest, DISABLED_CannotTurnOnAdaptiveAnalogRxAgc) { +TEST_F(AudioProcessingTest, CannotTurnOnAdaptiveAnalogRxAgc) { EXPECT_EQ(-1, voe_apm_->SetRxAgcStatus( channel_, true, webrtc::kAgcAdaptiveAnalog)); }