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

media/audio/audio_input_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_input_device.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
@@ skipping 32 matching lines @@
     AudioInputIPC* ipc,
     const scoped_refptr<base::MessageLoopProxy>& io_loop)
     : ScopedLoopObserver(io_loop),
       callback_(NULL),
       event_handler_(NULL),
       ipc_(ipc),
       stream_id_(0),
       session_id_(0),
       pending_device_ready_(false),
       agc_is_enabled_(false) {
-  CHECK(ipc_);
+  CHECK(ipc_.get());

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

.get() isn't necessary

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

Done.

 }
 
 void AudioInputDevice::Initialize(const AudioParameters& params,
                                   CaptureCallback* callback,
                                   CaptureEventHandler* event_handler) {
   DCHECK(!callback_);
   DCHECK(!event_handler_);
   audio_parameters_ = params;
   callback_ = callback;
   event_handler_ = event_handler;
@@ skipping 138 matching lines @@
                        agc_is_enabled_);
   }
 
   pending_device_ready_ = false;
   // Notify the client that the device has been started.
   if (event_handler_)
     event_handler_->OnDeviceStarted(device_id);
 }
 
 void AudioInputDevice::OnIPCClosed() {
-  ipc_ = NULL;
+  ipc_.reset();
 }
 
 AudioInputDevice::~AudioInputDevice() {
   // TODO(henrika): The current design requires that the user calls
   // Stop before deleting this class.
   CHECK_EQ(0, stream_id_);
 }
 
 void AudioInputDevice::InitializeOnIOThread() {
   DCHECK(message_loop()->BelongsToCurrentThread());
@@ skipping 24 matching lines @@
   DCHECK(message_loop()->BelongsToCurrentThread());
   if (stream_id_)
     ipc_->RecordStream(stream_id_);
 }
 
 void AudioInputDevice::ShutDownOnIOThread() {
   DCHECK(message_loop()->BelongsToCurrentThread());
   // NOTE: |completion| may be NULL.
   // Make sure we don't call shutdown more than once.
   if (stream_id_) {
-    if (ipc_) {
+    if (ipc_.get()) {

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

ditto

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

Done.

       ipc_->CloseStream(stream_id_);
       ipc_->RemoveDelegate(stream_id_);
     }
 
     stream_id_ = 0;
     session_id_ = 0;
     pending_device_ready_ = false;
     agc_is_enabled_ = false;
   }
 
@@ skipping 68 matching lines @@
   // with nominal range -1.0 -> +1.0.
   audio_bus_->FromInterleaved(memory, audio_bus_->frames(), bytes_per_sample);
 
   // Deliver captured data to the client in floating point format
   // and update the audio-delay measurement.
   capture_callback_->Capture(audio_bus_.get(),
                              audio_delay_milliseconds, volume);
 }
 
 }  // namespace media