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

content/browser/renderer_host/media/audio_renderer_host.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/browser/renderer_host/media/audio_renderer_host.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
@@ skipping 176 matching lines @@
     IPC_MESSAGE_HANDLER(AudioHostMsg_PauseStream, OnPauseStream)
     IPC_MESSAGE_HANDLER(AudioHostMsg_FlushStream, OnFlushStream)
     IPC_MESSAGE_HANDLER(AudioHostMsg_CloseStream, OnCloseStream)
     IPC_MESSAGE_HANDLER(AudioHostMsg_SetVolume, OnSetVolume)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
 
   return handled;
 }
 
+// TODO(miu): AudioRendererHost will keep track of the render_view_id associated
+// with the created audio stream in a soon-upcoming change.
 void AudioRendererHost::OnCreateStream(
-    int stream_id, const media::AudioParameters& params, int input_channels) {
+    int render_view_id, int stream_id, const media::AudioParameters& params,
+    int input_channels) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(LookupById(stream_id) == NULL);
 
+  // TODO(miu): There is still code in the renderer which has been stubbed out,
+  // and should be implemented to plumb in the source render_view_id.  In debug
+  // mode, log a WARNING until this is resolved.
+  DLOG_IF(WARNING, render_view_id <= 0)
+      << ("FIXME: AudioRendererHost::OnCreateStream called with unknown render "
+          "view.");
+  VLOG(1) << "AudioRendererHost@" << this

[Chris Rogers, 2012/10/17 20:43:11]

DVLOG

[miu, 2012/10/17 22:06:30]

Done.

+          << "::OnCreateStream(render_view_id=" << render_view_id
+          << ", stream_id=" << stream_id << ")";
+
   media::AudioParameters audio_params(params);
   uint32 buffer_size = media::AudioBus::CalculateMemorySize(audio_params);
   DCHECK_GT(buffer_size, 0U);
   DCHECK_LE(buffer_size,
             static_cast<uint32>(media::limits::kMaxPacketSizeInBytes));
 
   DCHECK_GE(input_channels, 0);
   DCHECK_LT(input_channels, media::limits::kMaxChannels);
 
   // Calculate output and input memory size.
@@ skipping 185 matching lines @@
 
   // Iterate the map of entries.
   // TODO(hclam): Implement a faster look up method.
   for (AudioEntryMap::iterator i = audio_entries_.begin();
        i != audio_entries_.end(); ++i) {
     if (!i->second->pending_close && controller == i->second->controller.get())
       return i->second;
   }
   return NULL;
 }