Plumb render view ID from audio-related code in renderer through IPCs to AudioRendererHost in brows…

content/renderer/pepper/pepper_platform_audio_output_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_output_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.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/media/audio_hardware.h"
 #include "content/renderer/media/audio_message_filter.h"
 #include "content/renderer/render_thread_impl.h"
 #include "media/base/media_switches.h"
 
 namespace content {
 
 // static
 PepperPlatformAudioOutputImpl* PepperPlatformAudioOutputImpl::Create(
+    int render_view_id,
     int sample_rate,
     int frames_per_buffer,
     webkit::ppapi::PluginDelegate::PlatformAudioOutputClient* client) {
   scoped_refptr<PepperPlatformAudioOutputImpl> audio_output(
-      new PepperPlatformAudioOutputImpl());
+      new PepperPlatformAudioOutputImpl(render_view_id));
   if (audio_output->Initialize(sample_rate, frames_per_buffer, client)) {
     // Balanced by Release invoked in
     // PepperPlatformAudioOutputImpl::ShutDownOnIOThread().
     return audio_output.release();
   }
   return NULL;
 }
 
 bool PepperPlatformAudioOutputImpl::StartPlayback() {
-  if (ipc_) {
+  if (ipc_.get()) {

[tommi (sloooow) - chröme, 2012/10/17 18:40:06]

nit: I don't think we need to call .get() like this anymore for scoped_ptr (see
chromium-dev), so you can revert the added .get()'s in this file.

[miu, 2012/10/17 20:10:44]

Done.

     ChildProcess::current()->io_message_loop()->PostTask(
         FROM_HERE,
         base::Bind(&PepperPlatformAudioOutputImpl::StartPlaybackOnIOThread,
                    this));
     return true;
   }
   return false;
 }
 
 bool PepperPlatformAudioOutputImpl::StopPlayback() {
-  if (ipc_) {
+  if (ipc_.get()) {
     ChildProcess::current()->io_message_loop()->PostTask(
         FROM_HERE,
         base::Bind(&PepperPlatformAudioOutputImpl::StopPlaybackOnIOThread,
                    this));
     return true;
   }
   return false;
 }
 
 void PepperPlatformAudioOutputImpl::ShutDown() {
@@ skipping 28 matching lines @@
     if (client_)
       client_->StreamCreated(handle, length, socket_handle);
   } else {
     main_message_loop_proxy_->PostTask(FROM_HERE,
         base::Bind(&PepperPlatformAudioOutputImpl::OnStreamCreated, this,
                    handle, socket_handle, length));
   }
 }
 
 void PepperPlatformAudioOutputImpl::OnIPCClosed() {
-  ipc_ = NULL;
+  ipc_.reset();
 }
 
 PepperPlatformAudioOutputImpl::~PepperPlatformAudioOutputImpl() {
   // Make sure we have been shut down. Warning: this will usually happen on
   // the I/O thread!
   DCHECK_EQ(0, stream_id_);
   DCHECK(!client_);
 }
 
-PepperPlatformAudioOutputImpl::PepperPlatformAudioOutputImpl()
+PepperPlatformAudioOutputImpl::PepperPlatformAudioOutputImpl(int render_view_id)
     : client_(NULL),
       stream_id_(0),
       main_message_loop_proxy_(base::MessageLoopProxy::current()) {
-  ipc_ = RenderThreadImpl::current()->audio_message_filter();
+  ipc_.reset(RenderThreadImpl::current()->audio_message_filter()->
+                 CreateAudioOutputIPC(render_view_id));
 }
 
 bool PepperPlatformAudioOutputImpl::Initialize(
     int sample_rate,
     int frames_per_buffer,
     webkit::ppapi::PluginDelegate::PlatformAudioOutputClient* client) {
   DCHECK(client);
   // Make sure we don't call init more than once.
   DCHECK_EQ(0, stream_id_);
 
@@ skipping 50 matching lines @@
 
   ipc_->CloseStream(stream_id_);
   ipc_->RemoveDelegate(stream_id_);
   stream_id_ = 0;
 
   Release();  // Release for the delegate, balances out the reference taken in
               // PepperPluginDelegateImpl::CreateAudio.
 }
 
 }  // namespace content