Tab Audio Mirroring: WebContentsAudioInputStream is a new implementation which represents the lifet…

media/audio/audio_manager_base.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_manager_base.h"
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/message_loop_proxy.h"
 #include "base/threading/thread.h"
 #include "media/audio/audio_output_dispatcher_impl.h"
 #include "media/audio/audio_output_proxy.h"
 #include "media/audio/audio_output_resampler.h"
 #include "media/audio/audio_util.h"
 #include "media/audio/fake_audio_input_stream.h"
 #include "media/audio/fake_audio_output_stream.h"
 #include "media/audio/virtual_audio_input_stream.h"
@@ skipping 90 matching lines @@
       params.format() == AudioParameters::AUDIO_FAKE ||
       !HasAudioOutputDevices();
 
   AudioOutputStream* stream = NULL;
   if (virtual_audio_input_stream_) {
 #if defined(OS_IOS)
     // We do not currently support iOS. It does not link.
     NOTIMPLEMENTED();
     return NULL;
 #else
-    stream = VirtualAudioOutputStream::MakeStream(this, params, message_loop_,
-        virtual_audio_input_stream_);
+    VirtualAudioOutputStream* const vaos =
+        new VirtualAudioOutputStream(
+            params, message_loop_, virtual_audio_input_stream_);
+    vaos->RunOnceClosed(base::Bind(

[DaleCurtis, 2013/01/15 22:02:18]

Why not make this callback required for construction? We do this frequently in
the media pipeline. Something like close_cb_, etc.

[miu, 2013/01/16 03:22:18]

Done.

+        &AudioManagerBase::ReleaseOutputStream, base::Unretained(this), vaos));
+    stream = vaos;
 #endif
   } else if (audio_output_disabled) {
     stream = FakeAudioOutputStream::MakeFakeStream(this, params);
   } else if (params.format() == AudioParameters::AUDIO_PCM_LINEAR) {
     stream = MakeLinearOutputStream(params);
   } else if (params.format() == AudioParameters::AUDIO_PCM_LOW_LATENCY) {
     stream = MakeLowLatencyOutputStream(params);
   }
 
   if (stream)
@@ skipping 25 matching lines @@
   if (params.format() == AudioParameters::AUDIO_VIRTUAL) {
 #if defined(OS_IOS)
     // We do not currently support iOS.
     NOTIMPLEMENTED();
     return NULL;
 #else
     // TODO(justinlin): Currently, audio mirroring will only work for the first
     // request. Subsequent requests will not get audio.
     if (!virtual_audio_input_stream_) {
       virtual_audio_input_stream_ =
-          VirtualAudioInputStream::MakeStream(this, params, message_loop_);
+          new VirtualAudioInputStream(params, message_loop_);
+      virtual_audio_input_stream_->RunOnceClosed(base::Bind(
+          &AudioManagerBase::ReleaseInputStream, base::Unretained(this),
+          virtual_audio_input_stream_));
       stream = virtual_audio_input_stream_;
       DVLOG(1) << "Virtual audio input stream created.";
 
       // Make all current output streams recreate themselves as
       // VirtualAudioOutputStreams that will attach to the above
       // VirtualAudioInputStream.
       NotifyAllOutputDeviceChangeListeners();
     } else {
       stream = NULL;
     }
@@ skipping 220 matching lines @@
   output_listeners_.RemoveObserver(listener);
 }
 
 void AudioManagerBase::NotifyAllOutputDeviceChangeListeners() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DVLOG(1) << "Firing OnDeviceChange() notifications.";
   FOR_EACH_OBSERVER(AudioDeviceListener, output_listeners_, OnDeviceChange());
 }
 
 }  // namespace media