Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Side by Side Diff: content/common/media/audio_messages.h

Issue 12440027: Do not pass the string device_id via IPC message to create an audio input stream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed Per's comments. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // IPC messages for the audio. 5 // IPC messages for the audio.
6 // Multiply-included message file, hence no include guard. 6 // Multiply-included message file, hence no include guard.
7 7
8 #include <string>
9
10 #include "base/basictypes.h" 8 #include "base/basictypes.h"
11 #include "base/shared_memory.h" 9 #include "base/shared_memory.h"
12 #include "base/sync_socket.h" 10 #include "base/sync_socket.h"
13 #include "content/common/content_export.h" 11 #include "content/common/content_export.h"
14 #include "content/common/media/media_param_traits.h" 12 #include "content/common/media/media_param_traits.h"
15 #include "ipc/ipc_message_macros.h" 13 #include "ipc/ipc_message_macros.h"
16 #include "media/audio/audio_buffers_state.h" 14 #include "media/audio/audio_buffers_state.h"
17 #include "media/audio/audio_input_ipc.h" 15 #include "media/audio/audio_input_ipc.h"
18 #include "media/audio/audio_output_ipc.h" 16 #include "media/audio/audio_output_ipc.h"
19 #include "media/audio/audio_parameters.h" 17 #include "media/audio/audio_parameters.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 78
81 // Notification message sent from browser to renderer for state update. 79 // Notification message sent from browser to renderer for state update.
82 IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyStreamStateChanged, 80 IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyStreamStateChanged,
83 int /* stream id */, 81 int /* stream id */,
84 media::AudioInputIPCDelegate::State /* new state */) 82 media::AudioInputIPCDelegate::State /* new state */)
85 83
86 IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyStreamVolume, 84 IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyStreamVolume,
87 int /* stream id */, 85 int /* stream id */,
88 double /* volume */) 86 double /* volume */)
89 87
90 IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyDeviceStarted,
91 int /* stream id */,
92 std::string /* device_id */)
93
94 // Messages sent from the renderer to the browser. 88 // Messages sent from the renderer to the browser.
95 89
96 // Request that got sent to browser for creating an audio output stream 90 // Request that got sent to browser for creating an audio output stream
97 IPC_MESSAGE_CONTROL2(AudioHostMsg_CreateStream, 91 IPC_MESSAGE_CONTROL2(AudioHostMsg_CreateStream,
98 int /* stream_id */, 92 int /* stream_id */,
99 media::AudioParameters /* params */) 93 media::AudioParameters /* params */)
100 94
101 // Request that got sent to browser for creating an audio input stream 95 // Request that got sent to browser for creating an audio input stream
102 IPC_MESSAGE_CONTROL5(AudioInputHostMsg_CreateStream, 96 IPC_MESSAGE_CONTROL5(AudioInputHostMsg_CreateStream,
103 int /* stream_id */, 97 int /* stream_id */,
98 int /* session_id */,
104 media::AudioParameters /* params */, 99 media::AudioParameters /* params */,
105 std::string /* device_id */,
106 bool /* automatic_gain_control */, 100 bool /* automatic_gain_control */,
107 uint32 /* shared memory count */) 101 uint32 /* shared memory count */)
108 102
109 // Indicate that audio for a stream is produced by the specified render view. 103 // Indicate that audio for a stream is produced by the specified render view.
110 IPC_MESSAGE_CONTROL2(AudioHostMsg_AssociateStreamWithProducer, 104 IPC_MESSAGE_CONTROL2(AudioHostMsg_AssociateStreamWithProducer,
111 int /* stream_id */, 105 int /* stream_id */,
112 int /* render_view_id */) 106 int /* render_view_id */)
113 107
114 // Indicate that audio for a stream is consumed by the specified render view. 108 // Indicate that audio for a stream is consumed by the specified render view.
115 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_AssociateStreamWithConsumer, 109 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_AssociateStreamWithConsumer,
(...skipping 27 matching lines...) Expand all
143 // Set audio volume of the stream specified by stream_id. 137 // Set audio volume of the stream specified by stream_id.
144 // TODO(hclam): change this to vector if we have channel numbers other than 2. 138 // TODO(hclam): change this to vector if we have channel numbers other than 2.
145 IPC_MESSAGE_CONTROL2(AudioHostMsg_SetVolume, 139 IPC_MESSAGE_CONTROL2(AudioHostMsg_SetVolume,
146 int /* stream_id */, 140 int /* stream_id */,
147 double /* volume */) 141 double /* volume */)
148 142
149 // Set audio volume of the input stream specified by stream_id. 143 // Set audio volume of the input stream specified by stream_id.
150 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_SetVolume, 144 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_SetVolume,
151 int /* stream_id */, 145 int /* stream_id */,
152 double /* volume */) 146 double /* volume */)
153
154 // Start the device referenced by the session_id for the input stream specified
155 // by stream_id.
156 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_StartDevice,
157 int /* stream_id */,
158 int /* session_id */)
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698