Attempt to fix audio wedges by restarting all streams.

media/audio/audio_output_dispatcher_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/audio_output_dispatcher_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 41 matching lines @@
   }
 
   close_timer_.Reset();
   return true;
 }
 
 bool AudioOutputDispatcherImpl::StartStream(
     AudioOutputStream::AudioSourceCallback* callback,
     AudioOutputProxy* stream_proxy) {
   DCHECK(message_loop_->BelongsToCurrentThread());
+  DCHECK(proxy_to_physical_map_.find(stream_proxy) ==
+         proxy_to_physical_map_.end());
 
   if (idle_streams_.empty() && !CreateAndOpenStream())
     return false;
 
   AudioOutputStream* physical_stream = idle_streams_.back();
   DCHECK(physical_stream);
   idle_streams_.pop_back();
 
   DCHECK_GT(paused_proxies_, 0u);
   --paused_proxies_;
@@ skipping 98 matching lines @@
     return false;
 
   if (!stream->Open()) {
     stream->Close();
     return false;
   }
   idle_streams_.push_back(stream);
   return true;
 }
 
 // This method is called by |close_timer_|.

[scherkus (not reviewing), 2013/12/02 21:49:37]

comment no longer valid (perhaps just remove it?)

[DaleCurtis, 2013/12/02 22:23:59]

All this is taken care of in my AOD cleanup CL, which I'll reland after this
workaround lands.  Just in case we decide to merge this to M32.

 void AudioOutputDispatcherImpl::ClosePendingStreams() {

[scherkus (not reviewing), 2013/12/02 21:49:37]

OOC any reason why this isn't called CloseIdleStreams()?

[DaleCurtis, 2013/12/02 22:23:59]

Ditto.

   DCHECK(message_loop_->BelongsToCurrentThread());
   while (!idle_streams_.empty()) {
     idle_streams_.back()->Close();
     idle_streams_.pop_back();
   }
 }
 
+void AudioOutputDispatcherImpl::CloseStreamsForWedgeFix() {
+  DCHECK(message_loop_->BelongsToCurrentThread());
+  ClosePendingStreams();

[scherkus (not reviewing), 2013/12/02 21:49:37]

it seems this only closes idle_streams_

do we need to worry about:
 1) the physical streams stored in proxy_to_physical_map_
 2) the physical streams in pausing_streams_ that have yet to be closed since
StopStreamTask() hasn't run yet?

[DaleCurtis, 2013/12/02 22:23:59]

For 1) AODI doesn't track the AudioSourceCallback information necessary to
perform the restart, only AOR does, which is why the fix is divided across both
classes.  I could move everything into AODI, but it would require adding a map
to track callbacks.

For 2) I do need to collapse pausing_streams_ into idle_streams_ here.  I'll add
that in the next update.

+}
+
+void AudioOutputDispatcherImpl::RestartStreamsForWedgeFix() {
+  DCHECK(message_loop_->BelongsToCurrentThread());
+
+  // Should only be called when the dispatcher is used with fake streams which
+  // don't need to be shutdown or restarted.
+  CHECK_EQ(params_.format(), AudioParameters::AUDIO_FAKE);
+}
+
 }  // namespace media