Fix initialization/termination of AudioDeviceTemplate

Fix initialization/termination of AudioDeviceTemplate

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=

Committed: https://crrev.com/9deaa86136e74fbf22065bf8a479780942e81fc8
Cr-Commit-Position: refs/heads/master@{#9760}

[Satoshi Matsumoto, 2015-08-16 10:41:59]

kaorimatz@gmail.com changed reviewers:
+ henrika@webrtc.org

[tommi (sloooow) - chröme, 2015-08-17 08:23:18]

tommi@chromium.org changed reviewers:
+ tommi@chromium.org

[tommi (sloooow) - chröme, 2015-08-17 08:23:19]

https://codereview.webrtc.org/1296693003/diff/1/webrtc/modules/audio_device/a...
File webrtc/modules/audio_device/android/audio_device_template.h (right):

https://codereview.webrtc.org/1296693003/diff/1/webrtc/modules/audio_device/a...
webrtc/modules/audio_device/android/audio_device_template.h:64:
audio_manager_->Init() & ((output_.Init() | input_.Init()) == 0);
Great that you noticed this.  Why bitwise operators though?

Shouldn't this just be:

initialized_ = audio_manager_->Init() && output_.Init() && input_.Init();

Hmm... if we really intend to handle the case if things go bad, we need to undo
what was previously done.
E.g.

if (!audio_manager_->Init())
  return -1;
if (!output_.Init()) {
  audio_manager_->Close();
  return -1;
}
if (!input_.Init()) {
  output_.Terminate();
  audio_manager_->Close();
  return -1;
}
initialized_ = true;
return 0;

https://codereview.webrtc.org/1296693003/diff/1/webrtc/modules/audio_device/a...
webrtc/modules/audio_device/android/audio_device_template.h:71:
!audio_manager_->Close();
There's not really much we can do here if things go wrong. I think this needs to
be a best effort kind of thing:

int32_t err = input_.Terminate();
err |= output_.Terminate();
err |= !audio_manager_->Close();
initialized_ = false;
DCHECK_EQ(err, 0);
return err;

[Satoshi Matsumoto, 2015-08-17 16:40:23]

Thanks for the review.

https://codereview.webrtc.org/1296693003/diff/1/webrtc/modules/audio_device/a...
File webrtc/modules/audio_device/android/audio_device_template.h (right):

https://codereview.webrtc.org/1296693003/diff/1/webrtc/modules/audio_device/a...
webrtc/modules/audio_device/android/audio_device_template.h:64:
audio_manager_->Init() & ((output_.Init() | input_.Init()) == 0);
On 2015/08/17 08:23:19, tommi wrote:
> Great that you noticed this.  Why bitwise operators though?
> 
> Shouldn't this just be:
> 
> initialized_ = audio_manager_->Init() && output_.Init() && input_.Init();
> 
> Hmm... if we really intend to handle the case if things go bad, we need to
undo
> what was previously done.
> E.g.
> 
> if (!audio_manager_->Init())
>   return -1;
> if (!output_.Init()) {
>   audio_manager_->Close();
>   return -1;
> }
> if (!input_.Init()) {
>   output_.Terminate();
>   audio_manager_->Close();
>   return -1;
> }
> initialized_ = true;
> return 0;

Done.

https://codereview.webrtc.org/1296693003/diff/1/webrtc/modules/audio_device/a...
webrtc/modules/audio_device/android/audio_device_template.h:71:
!audio_manager_->Close();
On 2015/08/17 08:23:19, tommi wrote:
> There's not really much we can do here if things go wrong. I think this needs
to
> be a best effort kind of thing:
> 
> int32_t err = input_.Terminate();
> err |= output_.Terminate();
> err |= !audio_manager_->Close();
> initialized_ = false;
> DCHECK_EQ(err, 0);
> return err;

Done.

[henrika_webrtc, 2015-08-18 07:23:31]

Thanks for fixing.

LGTM

[Satoshi Matsumoto, 2015-08-22 00:55:12]

The CQ bit was checked by kaorimatz@gmail.com

[commit-bot: I haz the power, 2015-08-22 00:55:18]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1296693003/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1296693003/40001

[commit-bot: I haz the power, 2015-08-22 01:38:54]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-08-22 01:39:06]

Patchset 3 (id:??) landed as
https://crrev.com/9deaa86136e74fbf22065bf8a479780942e81fc8
Cr-Commit-Position: refs/heads/master@{#9760}