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

content/common/media/audio_messages.h

 // 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.
 
 // IPC messages for the audio.
 // Multiply-included message file, hence no include guard.
 
 #include "base/basictypes.h"
 #include "base/shared_memory.h"
 #include "base/sync_socket.h"
 #include "content/common/content_export.h"
 #include "content/common/media/media_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "media/audio/audio_buffers_state.h"
 #include "media/audio/audio_input_ipc.h"
 #include "media/audio/audio_output_ipc.h"
 #include "media/audio/audio_parameters.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 #define IPC_MESSAGE_START AudioMsgStart
 
 IPC_ENUM_TRAITS(media::AudioInputIPCDelegate::State)
 IPC_ENUM_TRAITS(media::AudioOutputIPCDelegate::State)
 
+IPC_STRUCT_BEGIN(AudioInputHostMsg_CreateStream_Config)
+  IPC_STRUCT_MEMBER(media::AudioParameters, params)
+  IPC_STRUCT_MEMBER(bool, automatic_gain_control)
+  IPC_STRUCT_MEMBER(uint32, shared_memory_count)
+IPC_STRUCT_END()
+
 // Messages sent from the browser to the renderer.
 
 // Tell the renderer process that an audio stream has been created.
 // The renderer process is given a shared memory handle for the audio data
 // buffer it shares with the browser process. It is also given a SyncSocket that
 // it uses to communicate with the browser process about the state of the
 // buffered audio data.
 #if defined(OS_WIN)
 IPC_MESSAGE_CONTROL4(AudioMsg_NotifyStreamCreated,
                      int /* stream id */,
@@ skipping 44 matching lines @@
 IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyStreamStateChanged,
                      int /* stream id */,
                      media::AudioInputIPCDelegate::State /* new state */)
 
 IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyStreamVolume,
                      int /* stream id */,
                      double /* volume */)
 
 // Messages sent from the renderer to the browser.
 
-// Request that got sent to browser for creating an audio output stream
-IPC_MESSAGE_CONTROL2(AudioHostMsg_CreateStream,
+// Request that is sent to the browser for creating an audio output stream.
+// |render_view_id| is the routing ID for the render view producing the audio
+// data.
+IPC_MESSAGE_CONTROL3(AudioHostMsg_CreateStream,
                      int /* stream_id */,
+                     int /* render_view_id */,
                      media::AudioParameters /* params */)
 
-// Request that got sent to browser for creating an audio input stream
-IPC_MESSAGE_CONTROL5(AudioInputHostMsg_CreateStream,
+// Request that is sent to the browser for creating an audio input stream.
+// |render_view_id| is the routing ID for the render view consuming the audio
+// data.
+IPC_MESSAGE_CONTROL4(AudioInputHostMsg_CreateStream,
                      int /* stream_id */,
+                     int /* render_view_id */,
                      int /* session_id */,
-                     media::AudioParameters /* params */,
-                     bool /* automatic_gain_control */,
-                     uint32 /* shared memory count */)
-
-// Indicate that audio for a stream is produced by the specified render view.
-IPC_MESSAGE_CONTROL2(AudioHostMsg_AssociateStreamWithProducer,
-                     int /* stream_id */,
-                     int /* render_view_id */)
-
-// Indicate that audio for a stream is consumed by the specified render view.
-IPC_MESSAGE_CONTROL2(AudioInputHostMsg_AssociateStreamWithConsumer,
-                     int /* stream_id */,
-                     int /* render_view_id */)
+                     AudioInputHostMsg_CreateStream_Config)
 
 // Start buffering and play the audio stream specified by stream_id.
 IPC_MESSAGE_CONTROL1(AudioHostMsg_PlayStream,
                      int /* stream_id */)
 
 // Start recording the audio input stream specified by stream_id.
 IPC_MESSAGE_CONTROL1(AudioInputHostMsg_RecordStream,
                      int /* stream_id */)
 
 // Pause the audio stream specified by stream_id.
@@ skipping 11 matching lines @@
 // Set audio volume of the stream specified by stream_id.
 // TODO(hclam): change this to vector if we have channel numbers other than 2.
 IPC_MESSAGE_CONTROL2(AudioHostMsg_SetVolume,
                      int /* stream_id */,
                      double /* volume */)
 
 // Set audio volume of the input stream specified by stream_id.
 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_SetVolume,
                      int /* stream_id */,
                      double /* volume */)