Don't fallback if we've successfully opened a stream previously.

media/audio/audio_output_proxy.cc

Index: media/audio/audio_output_proxy.cc
diff --git a/media/audio/audio_output_proxy.cc b/media/audio/audio_output_proxy.cc
index 16b7955a0e357ef53ea5ac6234504137350bac8f..8bdc135805b9c4e68202afb5a218de8a28a46080 100644
--- a/media/audio/audio_output_proxy.cc
+++ b/media/audio/audio_output_proxy.cc
@@ -19,15 +19,15 @@ AudioOutputProxy::AudioOutputProxy(AudioOutputDispatcher* dispatcher)
 
 AudioOutputProxy::~AudioOutputProxy() {
   DCHECK(CalledOnValidThread());
-  CHECK(state_ == kCreated || state_ == kClosed) << "State is: " << state_;
+  DCHECK(state_ == kCreated || state_ == kClosed) << "State is: " << state_;
 }
 
 bool AudioOutputProxy::Open() {
   DCHECK(CalledOnValidThread());
-  CHECK_EQ(state_, kCreated);
+  DCHECK_EQ(state_, kCreated);
 
   if (!dispatcher_->OpenStream()) {
-    state_ = kError;
+    state_ = kOpenError;
     return false;
   }
 
@@ -37,10 +37,10 @@ bool AudioOutputProxy::Open() {
 
 void AudioOutputProxy::Start(AudioSourceCallback* callback) {
   DCHECK(CalledOnValidThread());
-  CHECK_EQ(state_, kOpened);
+  DCHECK_EQ(state_, kOpened);
 
   if (!dispatcher_->StartStream(callback, this)) {
-    state_ = kError;
+    state_ = kStartError;
     callback->OnError(this, 0);
     return;
   }
@@ -69,9 +69,10 @@ void AudioOutputProxy::GetVolume(double* volume) {
 
 void AudioOutputProxy::Close() {
   DCHECK(CalledOnValidThread());
-  DCHECK(state_ == kCreated || state_ == kError || state_ == kOpened);
+  DCHECK(state_ == kCreated || state_ == kOpenError || state_ == kOpened ||
+         state_ == kStartError);
 
-  if (state_ != kCreated)
+  if (state_ != kCreated && state_ != kOpenError)
     dispatcher_->CloseStream(this);

[scherkus (not reviewing), 2012/09/21 01:24:18]

so to confirm... kStartError means Open() was successful so we still have to
Close()?

if so... comment?

[DaleCurtis, 2012/09/21 02:57:27]

Done.

 
   state_ = kClosed;