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

Re-enable AGC tests:

Browse Source 
* AgcConfigTest.HasCorrectDefaultConfiguration
* AgcConfigTest.DealsWithInvalidParameters
* AgcConfigTest.CanGetAndSetAgcStatus
* AgcConfigTest.HasCorrectDefaultRxConfiguration
* AgcConfigTest.DealsWithInvalidRxParameters
* AgcConfigTest.CanGetAndSetRxAgcStatus
* AudioProcessingTest.AgcIsOnByDefault
* AudioProcessingTest.CanEnableAgcWithAllModes
* AudioProcessingTest.RxAgcShouldBeOffByDefault
* AudioProcessingTest.CanTurnOnDigitalRxAcg
* AudioProcessingTest.CannotTurnOnAdaptiveAnalogRxAgc

BUG=webrtc:2784
R=andrew@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5918 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
aluebs@webrtc.org 2014-04-16 11:58:18 +00:00
parent 7de47bce12
commit f927fd6481
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/voice_engine/channel.cc
View File

@ -879,7 +879,6 @@ Channel::Channel(int32_t channelId,
_voiceEngineObserverPtr(NULL), _voiceEngineObserverPtr(NULL),
_callbackCritSectPtr(NULL), _callbackCritSectPtr(NULL),
_transportPtr(NULL), _transportPtr(NULL),
rx_audioproc_(AudioProcessing::Create(VoEModuleId(instanceId, channelId))),
_rxVadObserverPtr(NULL), _rxVadObserverPtr(NULL),
_oldVadDecision(-1), _oldVadDecision(-1),
_sendFrameType(0), _sendFrameType(0),
@ -937,6 +936,10 @@ Channel::Channel(int32_t channelId,
statistics_proxy_.reset(new StatisticsProxy(_rtpRtcpModule->SSRC())); statistics_proxy_.reset(new StatisticsProxy(_rtpRtcpModule->SSRC()));
rtp_receive_statistics_->RegisterRtcpStatisticsCallback( rtp_receive_statistics_->RegisterRtcpStatisticsCallback(
statistics_proxy_.get()); statistics_proxy_.get());
Config audioproc_config;
audioproc_config.Set<ExperimentalAgc>(new ExperimentalAgc(false));
rx_audioproc_.reset(AudioProcessing::Create(audioproc_config));
} }
Channel::~Channel() Channel::~Channel()

14
webrtc/voice_engine/test/auto_test/extended/agc_config_test.cc
View File

@ -22,9 +22,7 @@ class AgcConfigTest : public AfterStreamingFixture {
webrtc::AgcConfig default_agc_config_; webrtc::AgcConfig default_agc_config_;
}; };
// TODO(aluebs): Re-enable tests in agc_config_test and audio_processing_test TEST_F(AgcConfigTest, HasCorrectDefaultConfiguration) {
// when possible. Bug: issue 2784.
TEST_F(AgcConfigTest, DISABLED_HasCorrectDefaultConfiguration) {
webrtc::AgcConfig agc_config; webrtc::AgcConfig agc_config;
EXPECT_EQ(0, voe_apm_->GetAgcConfig(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); 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_; webrtc::AgcConfig agc_config = default_agc_config_;
agc_config.digitalCompressionGaindB = 91; agc_config.digitalCompressionGaindB = 91;
EXPECT_EQ(-1, voe_apm_->SetAgcConfig(agc_config)) << "Should not be able " 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()); EXPECT_EQ(VE_APM_ERROR, voe_base_->LastError());
} }
TEST_F(AgcConfigTest, DISABLED_CanGetAndSetAgcStatus) { TEST_F(AgcConfigTest, CanGetAndSetAgcStatus) {
webrtc::AgcConfig agc_config; webrtc::AgcConfig agc_config;
agc_config.digitalCompressionGaindB = 17; agc_config.digitalCompressionGaindB = 17;
agc_config.targetLeveldBOv = 11; agc_config.targetLeveldBOv = 11;
@ -67,7 +65,7 @@ TEST_F(AgcConfigTest, DISABLED_CanGetAndSetAgcStatus) {
actual_config.targetLeveldBOv); actual_config.targetLeveldBOv);
} }
TEST_F(AgcConfigTest, DISABLED_HasCorrectDefaultRxConfiguration) { TEST_F(AgcConfigTest, HasCorrectDefaultRxConfiguration) {
webrtc::AgcConfig agc_config; webrtc::AgcConfig agc_config;
EXPECT_EQ(0, voe_apm_->GetRxAgcConfig(channel_, 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); 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_; webrtc::AgcConfig agc_config = default_agc_config_;
agc_config.digitalCompressionGaindB = 91; agc_config.digitalCompressionGaindB = 91;
EXPECT_EQ(-1, voe_apm_->SetRxAgcConfig(channel_, agc_config)) << 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()); EXPECT_EQ(VE_APM_ERROR, voe_base_->LastError());
} }
TEST_F(AgcConfigTest, DISABLED_CanGetAndSetRxAgcStatus) { TEST_F(AgcConfigTest, CanGetAndSetRxAgcStatus) {
webrtc::AgcConfig agc_config; webrtc::AgcConfig agc_config;
agc_config.digitalCompressionGaindB = 17; agc_config.digitalCompressionGaindB = 17;
agc_config.targetLeveldBOv = 11; agc_config.targetLeveldBOv = 11;

7
webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc
View File

@ -8,6 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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" #include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h"
class TestErrorObserver : public webrtc::VoiceEngineObserver { class TestErrorObserver : public webrtc::VoiceEngineObserver {
@ -22,7 +23,11 @@ class TestErrorObserver : public webrtc::VoiceEngineObserver {
AfterInitializationFixture::AfterInitializationFixture() AfterInitializationFixture::AfterInitializationFixture()
: error_observer_(new TestErrorObserver()) { : error_observer_(new TestErrorObserver()) {
EXPECT_EQ(0, voe_base_->Init()); webrtc::Config config;
config.Set<webrtc::ExperimentalAgc>(new webrtc::ExperimentalAgc(false));
webrtc::AudioProcessing* audioproc = webrtc::AudioProcessing::Create(config);
EXPECT_EQ(0, voe_base_->Init(NULL, audioproc));
#if defined(WEBRTC_ANDROID) #if defined(WEBRTC_ANDROID)
EXPECT_EQ(0, voe_hardware_->SetLoudspeakerStatus(false)); EXPECT_EQ(0, voe_hardware_->SetLoudspeakerStatus(false));

10
webrtc/voice_engine/test/auto_test/standard/audio_processing_test.cc
View File

@ -140,7 +140,7 @@ class AudioProcessingTest : public AfterStreamingFixture {
#if !defined(WEBRTC_IOS) && !defined(WEBRTC_ANDROID) #if !defined(WEBRTC_IOS) && !defined(WEBRTC_ANDROID)
TEST_F(AudioProcessingTest, DISABLED_AgcIsOnByDefault) { TEST_F(AudioProcessingTest, AgcIsOnByDefault) {
bool agc_enabled = false; bool agc_enabled = false;
webrtc::AgcModes agc_mode = webrtc::kAgcAdaptiveAnalog; webrtc::AgcModes agc_mode = webrtc::kAgcAdaptiveAnalog;
@ -149,7 +149,7 @@ TEST_F(AudioProcessingTest, DISABLED_AgcIsOnByDefault) {
EXPECT_EQ(webrtc::kAgcAdaptiveAnalog, agc_mode); EXPECT_EQ(webrtc::kAgcAdaptiveAnalog, agc_mode);
} }
TEST_F(AudioProcessingTest, DISABLED_CanEnableAgcWithAllModes) { TEST_F(AudioProcessingTest, CanEnableAgcWithAllModes) {
TryEnablingAgcWithMode(webrtc::kAgcAdaptiveDigital); TryEnablingAgcWithMode(webrtc::kAgcAdaptiveDigital);
TryEnablingAgcWithMode(webrtc::kAgcAdaptiveAnalog); TryEnablingAgcWithMode(webrtc::kAgcAdaptiveAnalog);
TryEnablingAgcWithMode(webrtc::kAgcFixedDigital); TryEnablingAgcWithMode(webrtc::kAgcFixedDigital);
@ -248,7 +248,7 @@ TEST_F(AudioProcessingTest, CanSetAecmMode) {
TryEnablingAecmWithMode(webrtc::kAecmSpeakerphone, false); TryEnablingAecmWithMode(webrtc::kAecmSpeakerphone, false);
} }
TEST_F(AudioProcessingTest, DISABLED_RxAgcShouldBeOffByDefault) { TEST_F(AudioProcessingTest, RxAgcShouldBeOffByDefault) {
bool rx_agc_enabled = true; bool rx_agc_enabled = true;
webrtc::AgcModes agc_mode = webrtc::kAgcDefault; webrtc::AgcModes agc_mode = webrtc::kAgcDefault;
@ -257,12 +257,12 @@ TEST_F(AudioProcessingTest, DISABLED_RxAgcShouldBeOffByDefault) {
EXPECT_EQ(webrtc::kAgcAdaptiveDigital, agc_mode); EXPECT_EQ(webrtc::kAgcAdaptiveDigital, agc_mode);
} }
TEST_F(AudioProcessingTest, DISABLED_CanTurnOnDigitalRxAcg) { TEST_F(AudioProcessingTest, CanTurnOnDigitalRxAcg) {
TryEnablingRxAgcWithMode(webrtc::kAgcAdaptiveDigital); TryEnablingRxAgcWithMode(webrtc::kAgcAdaptiveDigital);
TryEnablingRxAgcWithMode(webrtc::kAgcFixedDigital); TryEnablingRxAgcWithMode(webrtc::kAgcFixedDigital);
} }
TEST_F(AudioProcessingTest, DISABLED_CannotTurnOnAdaptiveAnalogRxAgc) { TEST_F(AudioProcessingTest, CannotTurnOnAdaptiveAnalogRxAgc) {
EXPECT_EQ(-1, voe_apm_->SetRxAgcStatus( EXPECT_EQ(-1, voe_apm_->SetRxAgcStatus(
channel_, true, webrtc::kAgcAdaptiveAnalog)); channel_, true, webrtc::kAgcAdaptiveAnalog));
} }