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

content/browser/renderer_host/media/audio_input_renderer_host.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.
 //
 // AudioInputRendererHost serves audio related requests from audio capturer
 // which lives inside the render process and provide access to audio hardware.
 //
 // Create stream sequence (AudioInputController = AIC):
 //
 // AudioInputHostMsg_CreateStream -> OnCreateStream -> AIC::CreateLowLatency ->
@@ skipping 16 matching lines @@
 #include <map>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/shared_memory.h"
+#include "content/common/media/audio_messages.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "media/audio/audio_input_controller.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/simple_sources.h"
 
 namespace media {
 class AudioManager;
 class AudioParameters;
 }
@@ skipping 30 matching lines @@
   friend class base::DeleteHelper<AudioInputRendererHost>;
 
   struct AudioEntry;
   typedef std::map<int, AudioEntry*> AudioEntryMap;
 
   virtual ~AudioInputRendererHost();
 
   // Methods called on IO thread ----------------------------------------------
 
   // Audio related IPC message handlers.
-  // Creates an audio input stream with the specified session id and format.
-  // |session_id| is used to find out which device to be used for the stream,
-  // when it is AudioInputDeviceManager::kFakeOpenSessionId, it uses the
-  // the default device. If this call is successful this object would keep an
-  // internal entry of the stream for the required properties.
+
+  // Creates an audio input stream with the specified format whose data is
+  // consumed by an entity in the render view referenced by |render_view_id|.
+  // |session_id| is used to find out which device to be used for the stream.
+  // When it is AudioInputDeviceManager::kFakeOpenSessionId, it uses the the
+  // default device.  Upon success/failure, the peer is notified via the
+  // NotifyStreamCreated message.
   void OnCreateStream(int stream_id,
+                      int render_view_id,
                       int session_id,
-                      const media::AudioParameters& params,
-                      bool automatic_gain_control,
-                      int shared_memory_count);
-
-  // Track that the data for the audio stream referenced by |stream_id| is
-  // consumed by an entity in the render view referenced by |render_view_id|.
-  void OnAssociateStreamWithConsumer(int stream_id, int render_view_id);
+                      const AudioInputHostMsg_CreateStream_Config& config);
 
   // Record the audio input stream referenced by |stream_id|.
   void OnRecordStream(int stream_id);
 
   // Close the audio stream referenced by |stream_id|.
   void OnCloseStream(int stream_id);
 
   // Set the volume of the audio stream referenced by |stream_id|.
   void OnSetVolume(int stream_id, double volume);
 
   // Complete the process of creating an audio input stream. This will set up
-  // the shared memory or shared socket in low latency mode.
+  // the shared memory or shared socket in low latency mode and send the
+  // NotifyStreamCreated message to the peer.
   void DoCompleteCreation(media::AudioInputController* controller);
 
   // Send a state change message to the renderer.
   void DoSendRecordingMessage(media::AudioInputController* controller);
 
   // Handle error coming from audio stream.
   void DoHandleError(media::AudioInputController* controller);
 
   // Send an error message to the renderer.
   void SendErrorMessage(int stream_id);
@@ skipping 28 matching lines @@
 
   // A map of stream IDs to audio sources.
   AudioEntryMap audio_entries_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioInputRendererHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_RENDERER_HOST_H_