Renderer side audio device change wip...

media/audio/audio_output_device.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_device.h"
 
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
@@ skipping 55 matching lines @@
                                      RenderCallback* callback) {
   DCHECK_GE(input_channels, 0);
   DCHECK_LT(input_channels, limits::kMaxChannels);
   input_channels_ = input_channels;
   Initialize(params, callback);
 }
 
 AudioOutputDevice::~AudioOutputDevice() {
   // The current design requires that the user calls Stop() before deleting
   // this class.
+  LOG(ERROR) << "AudioOutputDevice::~@" << this;
   DCHECK(audio_thread_.IsStopped());
 
   if (ipc_)
     ipc_->RemoveDelegate(stream_id_);
 }
 
 void AudioOutputDevice::Start() {
   DCHECK(callback_) << "Initialize hasn't been called";
   message_loop()->PostTask(FROM_HERE,
       base::Bind(&AudioOutputDevice::CreateStreamOnIOThread, this,
@@ skipping 93 matching lines @@
 
 void AudioOutputDevice::SetVolumeOnIOThread(double volume) {
   DCHECK(message_loop()->BelongsToCurrentThread());
   if (state_ >= CREATING_STREAM)
     ipc_->SetVolume(stream_id_, volume);
 }
 
 void AudioOutputDevice::OnStateChanged(AudioOutputIPCDelegate::State state) {
   DCHECK(message_loop()->BelongsToCurrentThread());
 
-  // Do nothing if the stream has been closed.
-  if (state_ < CREATING_STREAM)
+  // Do nothing if the stream has been closed.  Don't dereference the callback
+  // object if the audio thread is stopped or stopping.  That could mean that
+  // the callback object has been deleted.
+  // TODO(tommi): Add an explicit contract for clearing the callback object.
+  // Possibly require calling Initialize again or provide a callback object via
+  // Start() and clear it in Stop().
+  if (state_ < CREATING_STREAM || audio_thread_.IsStopped())
     return;
 
   if (state == AudioOutputIPCDelegate::kError) {
     DLOG(WARNING) << "AudioOutputDevice::OnStateChanged(kError)";
     // Don't dereference the callback object if the audio thread
     // is stopped or stopping.  That could mean that the callback
     // object has been deleted.
     // TODO(tommi): Add an explicit contract for clearing the callback
     // object.  Possibly require calling Initialize again or provide
     // a callback object via Start() and clear it in Stop().
-    if (!audio_thread_.IsStopped())
-      callback_->OnRenderError();
+    // if (!audio_thread_.IsStopped())
+    //   callback_->OnRenderError();
+  } else if (state == AudioOutputIPCDelegate::kDeviceChange) {
+    LOG(ERROR) << "AudioOutputDevice::kDeviceChange@" << this;
+    callback_->OnDeviceChange();
   }
 }
 
 void AudioOutputDevice::OnStreamCreated(
     base::SharedMemoryHandle handle,
     base::SyncSocket::Handle socket_handle,
     int length) {
   DCHECK(message_loop()->BelongsToCurrentThread());
 #if defined(OS_WIN)
   DCHECK(handle);
@@ skipping 121 matching lines @@
   // TODO(dalecurtis): Technically this is not always correct.  Due to channel
   // padding for alignment, there may be more data available than this.  We're
   // relying on AudioSyncReader::Read() to parse this with that in mind.  Rename
   // these methods to Set/GetActualFrameCount().
   SetActualDataSizeInBytes(
       &shared_memory_, memory_length_,
       num_frames * sizeof(*output_bus_->channel(0)) * output_bus_->channels());
 }
 
 }  // namespace media.