| Index: content/common/media/audio_messages.h
|
| diff --git a/content/common/media/audio_messages.h b/content/common/media/audio_messages.h
|
| index a13efa5eb527a2fb6d35f4bbe8d692f093afec6c..60b0b7cff015a51db5b4c435bfb9caf5a6f98543 100644
|
| --- a/content/common/media/audio_messages.h
|
| +++ b/content/common/media/audio_messages.h
|
| @@ -36,30 +36,19 @@ IPC_STRUCT_TRAITS_END()
|
|
|
| // Messages sent from the browser to the renderer.
|
|
|
| -// Sent by AudioRendererHost to renderer to request an audio packet.
|
| -IPC_MESSAGE_CONTROL2(AudioMsg_RequestPacket,
|
| - int /* stream id */,
|
| - AudioBuffersState)
|
| -
|
| -// Tell the renderer process that the audio stream has been created, renderer
|
| -// process would be given a ShareMemoryHandle that it should write to from
|
| -// then on.
|
| -IPC_MESSAGE_CONTROL3(AudioMsg_NotifyStreamCreated,
|
| - int /* stream id */,
|
| - base::SharedMemoryHandle /* handle */,
|
| - uint32 /* length */)
|
| -
|
| -// Tell the renderer process that a low latency audio stream has been created,
|
| -// renderer process would be given a SyncSocket that it should write to from
|
| -// then on.
|
| +// 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_NotifyLowLatencyStreamCreated,
|
| +IPC_MESSAGE_CONTROL4(AudioMsg_NotifyStreamCreated,
|
| int /* stream id */,
|
| base::SharedMemoryHandle /* handle */,
|
| base::SyncSocket::Handle /* socket handle */,
|
| uint32 /* length */)
|
| #else
|
| -IPC_MESSAGE_CONTROL4(AudioMsg_NotifyLowLatencyStreamCreated,
|
| +IPC_MESSAGE_CONTROL4(AudioMsg_NotifyStreamCreated,
|
| int /* stream id */,
|
| base::SharedMemoryHandle /* handle */,
|
| base::FileDescriptor /* socket handle */,
|
| @@ -94,10 +83,6 @@ IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyStreamStateChanged,
|
| int /* stream id */,
|
| AudioStreamState /* new state */)
|
|
|
| -IPC_MESSAGE_CONTROL2(AudioMsg_NotifyStreamVolume,
|
| - int /* stream id */,
|
| - double /* volume */)
|
| -
|
| IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyStreamVolume,
|
| int /* stream id */,
|
| double /* volume */)
|
| @@ -109,10 +94,9 @@ IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyDeviceStarted,
|
| // Messages sent from the renderer to the browser.
|
|
|
| // Request that got sent to browser for creating an audio output stream
|
| -IPC_MESSAGE_CONTROL3(AudioHostMsg_CreateStream,
|
| +IPC_MESSAGE_CONTROL2(AudioHostMsg_CreateStream,
|
| int /* stream_id */,
|
| - AudioParameters /* params */,
|
| - bool /* low-latency */)
|
| + AudioParameters /* params */)
|
|
|
| // Request that got sent to browser for creating an audio input stream
|
| IPC_MESSAGE_CONTROL4(AudioInputHostMsg_CreateStream,
|
| @@ -121,12 +105,6 @@ IPC_MESSAGE_CONTROL4(AudioInputHostMsg_CreateStream,
|
| bool /* low-latency */,
|
| std::string /* device_id */)
|
|
|
| -// Tell the browser the audio buffer prepared for stream (stream_id) is
|
| -// filled and is ready to be consumed.
|
| -IPC_MESSAGE_CONTROL2(AudioHostMsg_NotifyPacketReady,
|
| - int /* stream_id */,
|
| - uint32 /* packet size */)
|
| -
|
| // Start buffering and play the audio stream specified by stream_id.
|
| IPC_MESSAGE_CONTROL1(AudioHostMsg_PlayStream,
|
| int /* stream_id */)
|
| @@ -151,10 +129,6 @@ IPC_MESSAGE_CONTROL1(AudioHostMsg_CloseStream,
|
| IPC_MESSAGE_CONTROL1(AudioInputHostMsg_CloseStream,
|
| int /* stream_id */)
|
|
|
| -// Get audio volume of the stream specified by stream_id.
|
| -IPC_MESSAGE_CONTROL1(AudioHostMsg_GetVolume,
|
| - int /* stream_id */)
|
| -
|
| // Get audio volume of the input stream specified by
|
| // (render_view_id, stream_id).
|
| IPC_MESSAGE_CONTROL1(AudioInputHostMsg_GetVolume,
|
|
|