Adds AudioDevice factory for all audio clients in Chrome

content/renderer/media/audio_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 "content/renderer/media/audio_device.h"
 
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "content/common/child_process.h"
 #include "content/common/media/audio_messages.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/render_thread_impl.h"
+#include "content/renderer/media/audio_message_filter.h"
 #include "media/audio/audio_output_controller.h"
 #include "media/audio/audio_util.h"
 
 using media::AudioRendererSink;
 
 // Takes care of invoking the render callback on the audio thread.
 // An instance of this class is created for each capture stream in
 // OnStreamCreated().
 class AudioDevice::AudioThreadCallback
     : public AudioDeviceThread::Callback {
@@ skipping 14 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(AudioThreadCallback);
 };
 
 AudioDevice::AudioDevice()
     : ScopedLoopObserver(ChildProcess::current()->io_message_loop()),
       callback_(NULL),
       volume_(1.0),
       stream_id_(0),
       play_on_start_(true),
       is_started_(false) {
-  filter_ = RenderThreadImpl::current()->audio_message_filter();
+  DVLOG(1) << "AudioDevice::AudioDevice()";

[Chris Rogers, 2012/06/25 20:05:17]

I'd remove the DVLOG

[henrika (OOO until Aug 14), 2012/06/26 11:17:27]

Done.

+  // Use the filter instance already created on the main render thread.
+  CHECK(AudioMessageFilter::current()) << "Invalid audio message filter.";
+  filter_ = AudioMessageFilter::current();
 }
 
-AudioDevice::AudioDevice(const media::AudioParameters& params,
-                         RenderCallback* callback)
+AudioDevice::AudioDevice(AudioMessageFilter* filter)
     : ScopedLoopObserver(ChildProcess::current()->io_message_loop()),
-      audio_parameters_(params),
-      callback_(callback),
+      callback_(NULL),
       volume_(1.0),
+      filter_(filter),
       stream_id_(0),
       play_on_start_(true),
       is_started_(false) {
-  filter_ = RenderThreadImpl::current()->audio_message_filter();
+  DVLOG(1) << "AudioDevice::AudioDevice(filter)";

[Chris Rogers, 2012/06/25 20:05:17]

I'd remove the DVLOG

[henrika (OOO until Aug 14), 2012/06/26 11:17:27]

Done.

+  CHECK(filter_) << "Invalid audio message filter.";
 }
 
 void AudioDevice::Initialize(const media::AudioParameters& params,
                              RenderCallback* callback) {
   CHECK_EQ(0, stream_id_) <<
       "AudioDevice::Initialize() must be called before Start()";
 
   CHECK(!callback_);  // Calling Initialize() twice?
 
   audio_parameters_ = params;
   callback_ = callback;
 }
 
 AudioDevice::~AudioDevice() {
+  DVLOG(1) << "AudioDevice::~AudioDevice()";

[Chris Rogers, 2012/06/25 20:05:17]

I'd remove the DVLOG

[henrika (OOO until Aug 14), 2012/06/26 11:17:27]

Done.

   // The current design requires that the user calls Stop() before deleting
   // this class.
   CHECK_EQ(0, stream_id_);
 }
 
 void AudioDevice::Start() {
   DCHECK(callback_) << "Initialize hasn't been called";
   message_loop()->PostTask(FROM_HERE,
       base::Bind(&AudioDevice::CreateStreamOnIOThread, this,
                  audio_parameters_));
@@ skipping 206 matching lines @@
   // TODO(crogers/vrk): Figure out a way to avoid the float -> int -> float
   // conversions that happen in the <audio> and WebRTC scenarios.
   media::InterleaveFloatToInt(audio_data_, shared_memory_.memory(),
       audio_parameters_.frames_per_buffer(),
       audio_parameters_.bits_per_sample() / 8);
 
   // Let the host know we are done.
   media::SetActualDataSizeInBytes(&shared_memory_, memory_length_,
       num_frames * audio_parameters_.GetBytesPerFrame());
 }