summaryrefslogtreecommitdiff
path: root/voice_engine/channel.cc
diff options
context:
space:
mode:
authoraluebs@webrtc.org <aluebs@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-04-16 11:58:18 +0000
committeraluebs@webrtc.org <aluebs@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-04-16 11:58:18 +0000
commit1a07e42b9a0b19e818ae7f0910e0214252952757 (patch)
treeaf76c5c4d37f41dd4580f50e382f2b5633e068b1 /voice_engine/channel.cc
parent1ed7008c34205d4f606ed4436c3bdd8902c4428a (diff)
downloadwebrtc-1a07e42b9a0b19e818ae7f0910e0214252952757.tar.gz
Re-enable AGC tests:
* 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/webrtc@5918 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/channel.cc')
-rw-r--r--voice_engine/channel.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/voice_engine/channel.cc b/voice_engine/channel.cc
index 4f310d36..56a2d6c5 100644
--- a/voice_engine/channel.cc
+++ b/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<ExperimentalAgc>(new ExperimentalAgc(false));
+ rx_audioproc_.reset(AudioProcessing::Create(audioproc_config));
}
Channel::~Channel()