admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix initialization/termination of AudioDeviceTemplate

Browse Source 
AudioDeviceTemplate doesn't initialize `output_` and `input_` if the
initialization of `audio_manager_` succeeds. Similarly, it doesn't
terminate `input_` and `audio_manager_` if the termination of `output_`
succeeds. This CL fixes this.

BUG=

Review URL: https://codereview.webrtc.org/1296693003

Cr-Commit-Position: refs/heads/master@{#9760}
This commit is contained in:
kaorimatz 2015-08-21 18:38:50 -07:00 committed by Commit bot
parent 7612f1711c
commit 9deaa86136
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
webrtc/modules/audio_device/android/audio_device_template.h
View File

@ -60,15 +60,29 @@ class AudioDeviceTemplate : public AudioDeviceGeneric {
int32_t Init() override { int32_t Init() override {
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(!initialized_); DCHECK(!initialized_);
initialized_ = audio_manager_->Init() || output_.Init() || input_.Init(); if (!audio_manager_->Init())
return initialized_ ? 0 : -1; return -1;
if (output_.Init() != 0) {
audio_manager_->Close();
return -1;
}
if (input_.Init() != 0) {
output_.Terminate();
audio_manager_->Close();
return -1;
}
initialized_ = true;
return 0;
} }
int32_t Terminate() override { int32_t Terminate() override {
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
initialized_ = int32_t err = input_.Terminate();
!(output_.Terminate() || input_.Terminate() || audio_manager_->Close()); err |= output_.Terminate();
return !initialized_ ? 0 : -1; err |= !audio_manager_->Close();
initialized_ = false;
DCHECK_EQ(err, 0);
return err;
} }
bool Initialized() const override { bool Initialized() const override {