| 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 30 matching lines...) Expand all Loading... |
| 41 #else | 41 #else |
| 42 IPC_MESSAGE_CONTROL4(AudioMsg_NotifyStreamCreated, | 42 IPC_MESSAGE_CONTROL4(AudioMsg_NotifyStreamCreated, |
| 43 int /* stream id */, | 43 int /* stream id */, |
| 44 base::SharedMemoryHandle /* handle */, | 44 base::SharedMemoryHandle /* handle */, |
| 45 base::FileDescriptor /* socket handle */, | 45 base::FileDescriptor /* socket handle */, |
| 46 uint32 /* length */) | 46 uint32 /* length */) |
| 47 #endif | 47 #endif |
| 48 | 48 |
| 49 // Tell the renderer process that an audio input stream has been created. | 49 // Tell the renderer process that an audio input stream has been created. |
| 50 // The renderer process would be given a SyncSocket that it should read | 50 // The renderer process would be given a SyncSocket that it should read |
| 51 // from from then on. | 51 // from from then on. It is also given number of segments in shared memory. |
| 52 #if defined(OS_WIN) | 52 #if defined(OS_WIN) |
| 53 IPC_MESSAGE_CONTROL4(AudioInputMsg_NotifyStreamCreated, | 53 IPC_MESSAGE_CONTROL5(AudioInputMsg_NotifyStreamCreated, |
| 54 int /* stream id */, | 54 int /* stream id */, |
| 55 base::SharedMemoryHandle /* handle */, | 55 base::SharedMemoryHandle /* handle */, |
| 56 base::SyncSocket::Handle /* socket handle */, | 56 base::SyncSocket::Handle /* socket handle */, |
| 57 uint32 /* length */) | 57 uint32 /* length */, |
| 58 uint32 /* segment count */) |
| 58 #else | 59 #else |
| 59 IPC_MESSAGE_CONTROL4(AudioInputMsg_NotifyStreamCreated, | 60 IPC_MESSAGE_CONTROL5(AudioInputMsg_NotifyStreamCreated, |
| 60 int /* stream id */, | 61 int /* stream id */, |
| 61 base::SharedMemoryHandle /* handle */, | 62 base::SharedMemoryHandle /* handle */, |
| 62 base::FileDescriptor /* socket handle */, | 63 base::FileDescriptor /* socket handle */, |
| 63 uint32 /* length */) | 64 uint32 /* length */, |
| 65 uint32 /* segment count */) |
| 64 #endif | 66 #endif |
| 65 | 67 |
| 66 // Notification message sent from AudioRendererHost to renderer after an output | 68 // Notification message sent from AudioRendererHost to renderer after an output |
| 67 // device change has occurred. | 69 // device change has occurred. |
| 68 IPC_MESSAGE_CONTROL3(AudioMsg_NotifyDeviceChanged, | 70 IPC_MESSAGE_CONTROL3(AudioMsg_NotifyDeviceChanged, |
| 69 int /* stream_id */, | 71 int /* stream_id */, |
| 70 int /* new_buffer_size */, | 72 int /* new_buffer_size */, |
| 71 int /* new_sample_rate */) | 73 int /* new_sample_rate */) |
| 72 | 74 |
| 73 // Notification message sent from AudioRendererHost to renderer for state | 75 // Notification message sent from AudioRendererHost to renderer for state |
| (...skipping 16 matching lines...) Expand all Loading... |
| 90 std::string /* device_id */) | 92 std::string /* device_id */) |
| 91 | 93 |
| 92 // Messages sent from the renderer to the browser. | 94 // Messages sent from the renderer to the browser. |
| 93 | 95 |
| 94 // Request that got sent to browser for creating an audio output stream | 96 // Request that got sent to browser for creating an audio output stream |
| 95 IPC_MESSAGE_CONTROL2(AudioHostMsg_CreateStream, | 97 IPC_MESSAGE_CONTROL2(AudioHostMsg_CreateStream, |
| 96 int /* stream_id */, | 98 int /* stream_id */, |
| 97 media::AudioParameters /* params */) | 99 media::AudioParameters /* params */) |
| 98 | 100 |
| 99 // Request that got sent to browser for creating an audio input stream | 101 // Request that got sent to browser for creating an audio input stream |
| 100 IPC_MESSAGE_CONTROL4(AudioInputHostMsg_CreateStream, | 102 IPC_MESSAGE_CONTROL5(AudioInputHostMsg_CreateStream, |
| 101 int /* stream_id */, | 103 int /* stream_id */, |
| 102 media::AudioParameters /* params */, | 104 media::AudioParameters /* params */, |
| 103 std::string /* device_id */, | 105 std::string /* device_id */, |
| 104 bool /* automatic_gain_control */) | 106 bool /* automatic_gain_control */, |
| 107 uint32 /* shared memory count */) |
| 105 | 108 |
| 106 // Indicate that audio for a stream is produced by the specified render view. | 109 // Indicate that audio for a stream is produced by the specified render view. |
| 107 IPC_MESSAGE_CONTROL2(AudioHostMsg_AssociateStreamWithProducer, | 110 IPC_MESSAGE_CONTROL2(AudioHostMsg_AssociateStreamWithProducer, |
| 108 int /* stream_id */, | 111 int /* stream_id */, |
| 109 int /* render_view_id */) | 112 int /* render_view_id */) |
| 110 | 113 |
| 111 // Indicate that audio for a stream is consumed by the specified render view. | 114 // Indicate that audio for a stream is consumed by the specified render view. |
| 112 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_AssociateStreamWithConsumer, | 115 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_AssociateStreamWithConsumer, |
| 113 int /* stream_id */, | 116 int /* stream_id */, |
| 114 int /* render_view_id */) | 117 int /* render_view_id */) |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 // Set audio volume of the input stream specified by stream_id. | 149 // Set audio volume of the input stream specified by stream_id. |
| 147 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_SetVolume, | 150 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_SetVolume, |
| 148 int /* stream_id */, | 151 int /* stream_id */, |
| 149 double /* volume */) | 152 double /* volume */) |
| 150 | 153 |
| 151 // Start the device referenced by the session_id for the input stream specified | 154 // Start the device referenced by the session_id for the input stream specified |
| 152 // by stream_id. | 155 // by stream_id. |
| 153 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_StartDevice, | 156 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_StartDevice, |
| 154 int /* stream_id */, | 157 int /* stream_id */, |
| 155 int /* session_id */) | 158 int /* session_id */) |
| OLD | NEW |