zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove ProcessingComponent's dependence on AudioProcessingImpl.

Browse Source 
- Move needed accessors to AudioProcessing.
- Inject the crit directly as a dependency.
- Remove the now unneeded EchoCancellationImplWrapper.

BUG=2894
R=aluebs@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5620 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org
2014-02-27 22:23:17 +00:00
parent 806768a6ca
commit 56e4a05053
22 changed files with 147 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
webrtc/modules/audio_processing/processing_component.cc
View File

@ -12,15 +12,12 @@
#include <assert.h>
#include "webrtc/modules/audio_processing/audio_processing_impl.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
namespace webrtc {
ProcessingComponent::ProcessingComponent() {}
ProcessingComponent::ProcessingComponent(const AudioProcessingImpl* apm)
: apm_(apm),
initialized_(false),
ProcessingComponent::ProcessingComponent()
: initialized_(false),
enabled_(false),
num_handles_(0) {}
@ -35,7 +32,7 @@ int ProcessingComponent::Destroy() {
}
initialized_ = false;
return apm_->kNoError;
return AudioProcessing::kNoError;
}
int ProcessingComponent::EnableComponent(bool enable) {
@ -43,7 +40,7 @@ int ProcessingComponent::EnableComponent(bool enable) {
enabled_ = enable; // Must be set before Initialize() is called.
int err = Initialize();
if (err != apm_->kNoError) {
if (err != AudioProcessing::kNoError) {
enabled_ = false;
return err;
}
@ -51,7 +48,7 @@ int ProcessingComponent::EnableComponent(bool enable) {
enabled_ = enable;
}
return apm_->kNoError;
return AudioProcessing::kNoError;
}
bool ProcessingComponent::is_component_enabled() const {
@ -69,7 +66,7 @@ int ProcessingComponent::num_handles() const {
int ProcessingComponent::Initialize() {
if (!enabled_) {
return apm_->kNoError;
return AudioProcessing::kNoError;
}
num_handles_ = num_handles_required();
@ -82,12 +79,12 @@ int ProcessingComponent::Initialize() {
if (handles_[i] == NULL) {
handles_[i] = CreateHandle();
if (handles_[i] == NULL) {
return apm_->kCreationFailedError;
return AudioProcessing::kCreationFailedError;
}
}
int err = InitializeHandle(handles_[i]);
if (err != apm_->kNoError) {
if (err != AudioProcessing::kNoError) {
return GetHandleError(handles_[i]);
}
}
@ -98,17 +95,17 @@ int ProcessingComponent::Initialize() {
int ProcessingComponent::Configure() {
if (!initialized_) {
return apm_->kNoError;
return AudioProcessing::kNoError;
}
assert(static_cast<int>(handles_.size()) >= num_handles_);
for (int i = 0; i < num_handles_; i++) {
int err = ConfigureHandle(handles_[i]);
if (err != apm_->kNoError) {
if (err != AudioProcessing::kNoError) {
return GetHandleError(handles_[i]);
}
}
return apm_->kNoError;
return AudioProcessing::kNoError;
}
} // namespace webrtc