content/common/media/audio_messages.h - Issue 12383016: Merge AssociateStreamWithProducer message into CreateStream message for both audio output and input.

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

Issue 12383016: Merge AssociateStreamWithProducer message into CreateStream message for both audio output and input. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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

« no previous file with comments | « content/browser/renderer_host/media/audio_renderer_host_unittest.cc ('k') | content/content_renderer.gypi » ('j') | content/renderer/media/audio_message_filter.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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>	8 #include <string>

9	9

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

(...skipping 73 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
84 IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyStreamVolume,	84 IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyStreamVolume,

85 int /* stream id */,	85 int /* stream id */,

86 double /* volume */)	86 double /* volume */)

87	87

88 IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyDeviceStarted,	88 IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyDeviceStarted,

89 int /* stream id */,	89 int /* stream id */,

90 std::string /* device_id */)	90 std::string /* device_id */)

91	91

92 // Messages sent from the renderer to the browser.	92 // Messages sent from the renderer to the browser.

93	93

94 // Request that got sent to browser for creating an audio output stream	94 // Request that is sent to the browser for creating an audio output stream.

95 IPC_MESSAGE_CONTROL2(AudioHostMsg_CreateStream,	95 // \|render_view_id\| is the routing ID for the render view producing the audio

	96 // data.

	97 IPC_MESSAGE_CONTROL3(AudioHostMsg_CreateStream,

96 int /* stream_id */,	98 int /* stream_id */,

	99 int /* render_view_id */,

97 media::AudioParameters /* params */)	100 media::AudioParameters /* params */)

98	101

99 // Request that got sent to browser for creating an audio input stream	102 // Request that got sent to browser for creating an audio input stream

100 IPC_MESSAGE_CONTROL4(AudioInputHostMsg_CreateStream,	103 IPC_MESSAGE_CONTROL4(AudioInputHostMsg_CreateStream,

101 int /* stream_id */,	104 int /* stream_id */,

102 media::AudioParameters /* params */,	105 media::AudioParameters /* params */,

103 std::string /* device_id */,	106 std::string /* device_id */,

104 bool /* automatic_gain_control */)	107 bool /* automatic_gain_control */)

105	108

106 // Indicate that audio for a stream is produced by the specified render view.

107 IPC_MESSAGE_CONTROL2(AudioHostMsg_AssociateStreamWithProducer,

108 int /* stream_id */,

109 int /* render_view_id */)

110

111 // Indicate that audio for a stream is consumed by the specified render view.	109 // Indicate that audio for a stream is consumed by the specified render view.

112 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_AssociateStreamWithConsumer,	110 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_AssociateStreamWithConsumer,

113 int /* stream_id */,	111 int /* stream_id */,

114 int /* render_view_id */)	112 int /* render_view_id */)

115	113

116 // Start buffering and play the audio stream specified by stream_id.	114 // Start buffering and play the audio stream specified by stream_id.

117 IPC_MESSAGE_CONTROL1(AudioHostMsg_PlayStream,	115 IPC_MESSAGE_CONTROL1(AudioHostMsg_PlayStream,

118 int /* stream_id */)	116 int /* stream_id */)

119	117

120 // Start recording the audio input stream specified by stream_id.	118 // Start recording the audio input stream specified by stream_id.

(...skipping 25 matching lines...) Expand all Loading...
146 // Set audio volume of the input stream specified by stream_id.	144 // Set audio volume of the input stream specified by stream_id.

147 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_SetVolume,	145 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_SetVolume,

148 int /* stream_id */,	146 int /* stream_id */,

149 double /* volume */)	147 double /* volume */)

150	148

151 // Start the device referenced by the session_id for the input stream specified	149 // Start the device referenced by the session_id for the input stream specified

152 // by stream_id.	150 // by stream_id.

153 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_StartDevice,	151 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_StartDevice,

154 int /* stream_id */,	152 int /* stream_id */,

155 int /* session_id */)	153 int /* session_id */)

OLD	NEW