Merge AssociateStreamWithProducer message into CreateStream message for both audio output and input.

content/browser/renderer_host/media/audio_input_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_input_renderer_host.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
@@ skipping 167 matching lines @@
 
   DeleteEntryOnError(entry);
 }
 
 bool AudioInputRendererHost::OnMessageReceived(const IPC::Message& message,
                                                bool* message_was_ok) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(AudioInputRendererHost, message, *message_was_ok)
     IPC_MESSAGE_HANDLER(AudioInputHostMsg_StartDevice, OnStartDevice)
     IPC_MESSAGE_HANDLER(AudioInputHostMsg_CreateStream, OnCreateStream)
-    IPC_MESSAGE_HANDLER(AudioInputHostMsg_AssociateStreamWithConsumer,
-                        OnAssociateStreamWithConsumer)
     IPC_MESSAGE_HANDLER(AudioInputHostMsg_RecordStream, OnRecordStream)
     IPC_MESSAGE_HANDLER(AudioInputHostMsg_CloseStream, OnCloseStream)
     IPC_MESSAGE_HANDLER(AudioInputHostMsg_SetVolume, OnSetVolume)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
 
   return handled;
 }
 
 void AudioInputRendererHost::OnStartDevice(int stream_id, int session_id) {
   VLOG(1) << "AudioInputRendererHost::OnStartDevice(stream_id="
           << stream_id << ", session_id = " << session_id << ")";
 
   // Add the session entry to the map.
   session_entries_[session_id] = stream_id;
 
   // Start the device with the session_id. If the device is started
   // successfully, OnDeviceStarted() callback will be triggered.
   media_stream_manager_->audio_input_device_manager()->Start(session_id, this);
 }
 
 void AudioInputRendererHost::OnCreateStream(
-    int stream_id, const media::AudioParameters& params,
+    int stream_id, int render_view_id, const media::AudioParameters& params,
     const std::string& device_id, bool automatic_gain_control) {
-  VLOG(1) << "AudioInputRendererHost::OnCreateStream(stream_id="
-          << stream_id << ")";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+
+  DVLOG(1) << "AudioInputRendererHost@" << this
+           << "::OnCreateStream(stream_id=" << stream_id
+           << ", render_view_id=" << render_view_id << ")";
+  DCHECK_LT(0, render_view_id);

[DaleCurtis, 2013/03/05 23:29:54]

Yoda is persona non grata in Chrome style.

[miu, 2013/03/06 22:36:52]

Gtest semantics, I blame.  Fixed all of these, I have.

+
   // media::AudioParameters is validated in the deserializer.
   if (LookupById(stream_id) != NULL) {
     SendErrorMessage(stream_id);
     return;
   }
 
   media::AudioParameters audio_params(params);
 
   if (media_stream_manager_->audio_input_device_manager()->
       ShouldUseFakeDevice()) {
     audio_params.Reset(media::AudioParameters::AUDIO_FAKE,
                        params.channel_layout(), 0, params.sample_rate(),
                        params.bits_per_sample(), params.frames_per_buffer());
   }
 
   uint32 buffer_size = audio_params.GetBytesPerBuffer();
 
   // Create a new AudioEntry structure.
   scoped_ptr<AudioEntry> entry(new AudioEntry());
 
   uint32 mem_size = sizeof(media::AudioInputBufferParameters) + buffer_size;

[palmer, 2013/03/05 21:09:32]

This addition could overflow; buffer_size comes from an untrustworthy source.
Check that buffer_size is sane before doing this addition.

[DaleCurtis, 2013/03/05 23:29:54]

This is sanitized in media_param_traits by checking AudioParameters::IsValid().

 
   // Create the shared memory and share it with the renderer process
   // using a new SyncWriter object.
   if (!entry->shared_memory.CreateAndMapAnonymous(mem_size)) {
     // If creation of shared memory failed then send an error message.
     SendErrorMessage(stream_id);
     return;
   }
 
   scoped_ptr<AudioInputSyncWriter> writer(
@@ skipping 29 matching lines @@
   if (!entry->controller) {
     SendErrorMessage(stream_id);
     return;
   }
 
   // Set the initial AGC state for the audio input stream. Note that, the AGC
   // is only supported in AUDIO_PCM_LOW_LATENCY mode.
   if (params.format() == media::AudioParameters::AUDIO_PCM_LOW_LATENCY)
     entry->controller->SetAutomaticGainControl(automatic_gain_control);
 
-  // If we have created the controller successfully create a entry and add it
+  // Since the controller was created successfully, create an entry and add it
   // to the map.
   entry->stream_id = stream_id;
-
   audio_entries_.insert(std::make_pair(stream_id, entry.release()));
 }
 
-void AudioInputRendererHost::OnAssociateStreamWithConsumer(int stream_id,
-                                                           int render_view_id) {
-  // TODO(miu): Will use render_view_id in upcoming change.
-  DVLOG(1) << "AudioInputRendererHost@" << this
-           << "::OnAssociateStreamWithConsumer(stream_id=" << stream_id
-           << ", render_view_id=" << render_view_id << ")";
-}
-
 void AudioInputRendererHost::OnRecordStream(int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(stream_id);
   if (!entry) {
     SendErrorMessage(stream_id);
     return;
   }
 
   entry->controller->Record();
@@ skipping 144 matching lines @@
   for (SessionEntryMap::iterator it = session_entries_.begin();
        it != session_entries_.end(); ++it) {
     if (stream_id == it->second) {
       return it->first;
     }
   }
   return 0;
 }
 
 }  // namespace content