First step towards moving AudioDevice from content/ to media/audio.

content/renderer/pepper/pepper_platform_audio_input_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 "content/renderer/pepper/pepper_platform_audio_input_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "build/build_config.h"
 #include "content/common/child_process.h"
 #include "content/common/media/audio_messages.h"
 #include "content/renderer/pepper/pepper_plugin_delegate_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "media/audio/audio_manager_base.h"
 
 namespace content {
 
 // static
 PepperPlatformAudioInputImpl* PepperPlatformAudioInputImpl::Create(
     const base::WeakPtr<PepperPluginDelegateImpl>& plugin_delegate,
     const std::string& device_id,
     int sample_rate,
     int frames_per_buffer,
     webkit::ppapi::PluginDelegate::PlatformAudioInputClient* client) {
   scoped_refptr<PepperPlatformAudioInputImpl> audio_input(
-      new PepperPlatformAudioInputImpl);
+      new PepperPlatformAudioInputImpl());
   if (audio_input->Initialize(plugin_delegate, device_id, sample_rate,
                               frames_per_buffer, client)) {
     // Balanced by Release invoked in
     // PepperPlatformAudioInputImpl::ShutDownOnIOThread().
     return audio_input.release();
   }
   return NULL;
 }
 
 void PepperPlatformAudioInputImpl::StartCapture() {
@@ skipping 52 matching lines @@
     } else {
       // Clean up the handles.
       base::SyncSocket temp_socket(socket_handle);
       base::SharedMemory temp_shared_memory(handle, false);
     }
   }
 }
 
 void PepperPlatformAudioInputImpl::OnVolume(double volume) {}
 
-void PepperPlatformAudioInputImpl::OnStateChanged(AudioStreamState state) {}
+void PepperPlatformAudioInputImpl::OnStateChanged(
+    media::AudioInputDeviceIPCDelegate::State state) {
+}
 
 void PepperPlatformAudioInputImpl::OnDeviceReady(const std::string& device_id) {
   DCHECK(ChildProcess::current()->io_message_loop_proxy()->
       BelongsToCurrentThread());
 
   if (shutdown_called_)
     return;
 
   if (device_id.empty()) {
     main_message_loop_proxy_->PostTask(
         FROM_HERE,
         base::Bind(&PepperPlatformAudioInputImpl::NotifyStreamCreationFailed,
                    this));
   } else {
     // We will be notified by OnStreamCreated().
-    filter_->Send(new AudioInputHostMsg_CreateStream(stream_id_, params_,
-                                                     device_id, false));
+    ipc_->CreateStream(stream_id_, params_, device_id, false);
   }
 }
 
+void PepperPlatformAudioInputImpl::OnIPCClosed() {
+  ipc_ = NULL;

[scherkus (not reviewing), 2012/07/24 17:57:48]

null deref if stream_id != 0?

[tommi (sloooow) - chröme, 2012/07/25 13:46:17]

See other comment. I didn't want to add reference counting to the ipc interface
as in practice it isn't needed.  This is to force NULL crashes instead of
referencing deleted memory in case we make a mistake.

+}
+
 PepperPlatformAudioInputImpl::~PepperPlatformAudioInputImpl() {
   // Make sure we have been shut down. Warning: this may happen on the I/O
   // thread!
   // Although these members should be accessed on a specific thread (either the
   // main thread or the I/O thread), it should be fine to examine their value
   // here.
   DCHECK_EQ(0, stream_id_);
   DCHECK(!client_);
   DCHECK(label_.empty());
   DCHECK(shutdown_called_);
 }
 
 PepperPlatformAudioInputImpl::PepperPlatformAudioInputImpl()
     : client_(NULL),
       stream_id_(0),
       main_message_loop_proxy_(base::MessageLoopProxy::current()),
       shutdown_called_(false) {
-  filter_ = RenderThreadImpl::current()->audio_input_message_filter();
+  ipc_ = RenderThreadImpl::current()->audio_input_message_filter();
 }
 
 bool PepperPlatformAudioInputImpl::Initialize(
     const base::WeakPtr<PepperPluginDelegateImpl>& plugin_delegate,
     const std::string& device_id,
     int sample_rate,
     int frames_per_buffer,
     webkit::ppapi::PluginDelegate::PlatformAudioInputClient* client) {
   DCHECK(main_message_loop_proxy_->BelongsToCurrentThread());
 
@@ skipping 24 matching lines @@
 
 void PepperPlatformAudioInputImpl::InitializeOnIOThread(int session_id) {
   DCHECK(ChildProcess::current()->io_message_loop_proxy()->
       BelongsToCurrentThread());
 
   if (shutdown_called_)
     return;
 
   // Make sure we don't call init more than once.
   DCHECK_EQ(0, stream_id_);
-  stream_id_ = filter_->AddDelegate(this);
+  stream_id_ = ipc_->AddDelegate(this);
   DCHECK_NE(0, stream_id_);
 
   if (!session_id) {
     // We will be notified by OnStreamCreated().
-    filter_->Send(new AudioInputHostMsg_CreateStream(
-        stream_id_, params_,
-        media::AudioManagerBase::kDefaultDeviceId, false));
+    ipc_->CreateStream(stream_id_, params_,
+        media::AudioManagerBase::kDefaultDeviceId, false);
   } else {
     // We will be notified by OnDeviceReady().
-    filter_->Send(new AudioInputHostMsg_StartDevice(stream_id_, session_id));
+    ipc_->StartDevice(stream_id_, session_id);
   }
 }
 
 void PepperPlatformAudioInputImpl::StartCaptureOnIOThread() {
   DCHECK(ChildProcess::current()->io_message_loop_proxy()->
       BelongsToCurrentThread());
 
   if (stream_id_)
-    filter_->Send(new AudioInputHostMsg_RecordStream(stream_id_));
+    ipc_->RecordStream(stream_id_);
 }
 
 void PepperPlatformAudioInputImpl::StopCaptureOnIOThread() {
   DCHECK(ChildProcess::current()->io_message_loop_proxy()->
       BelongsToCurrentThread());
 
   // TODO(yzshen): We cannot re-start capturing if the stream is closed.
   if (stream_id_)
-    filter_->Send(new AudioInputHostMsg_CloseStream(stream_id_));
+    ipc_->CloseStream(stream_id_);
 }
 
 void PepperPlatformAudioInputImpl::ShutDownOnIOThread() {
   DCHECK(ChildProcess::current()->io_message_loop_proxy()->
       BelongsToCurrentThread());
 
   // Make sure we don't call shutdown more than once.
   if (shutdown_called_)
     return;
   shutdown_called_ = true;
 
   if (stream_id_) {
-    filter_->Send(new AudioInputHostMsg_CloseStream(stream_id_));
-    filter_->RemoveDelegate(stream_id_);
+    ipc_->CloseStream(stream_id_);
+    ipc_->RemoveDelegate(stream_id_);
     stream_id_ = 0;
   }
 
   main_message_loop_proxy_->PostTask(
       FROM_HERE,
       base::Bind(&PepperPlatformAudioInputImpl::CloseDevice, this));
 
   Release();  // Release for the delegate, balances out the reference taken in
               // PepperPluginDelegateImpl::CreateAudioInput.
 }
@@ skipping 33 matching lines @@
 }
 
 void PepperPlatformAudioInputImpl::NotifyStreamCreationFailed() {
   DCHECK(main_message_loop_proxy_->BelongsToCurrentThread());
 
   if (client_)
     client_->StreamCreationFailed();
 }
 
 }  // namespace content