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

Unified Diff: content/browser/renderer_host/render_message_filter.cc

Issue 11880009: Introduce AudioHardwareConfig for renderer side audio device info. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Style nits. Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/render_message_filter.h ('k') | content/common/media/audio_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_message_filter.cc
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index a659ea67fa7be30bb38257b1b4003982acdb4deb..eeaa8b49176a2ff22355f9193440519830fc17e9 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -417,14 +417,8 @@ bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message,
IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_Keygen, OnKeygen)
IPC_MESSAGE_HANDLER(ViewHostMsg_AsyncOpenFile, OnAsyncOpenFile)
IPC_MESSAGE_HANDLER(ViewHostMsg_GetCPUUsage, OnGetCPUUsage)
- IPC_MESSAGE_HANDLER(ViewHostMsg_GetHardwareBufferSize,
- OnGetHardwareBufferSize)
- IPC_MESSAGE_HANDLER(ViewHostMsg_GetHardwareInputSampleRate,
- OnGetHardwareInputSampleRate)
- IPC_MESSAGE_HANDLER(ViewHostMsg_GetHardwareSampleRate,
- OnGetHardwareSampleRate)
- IPC_MESSAGE_HANDLER(ViewHostMsg_GetHardwareInputChannelLayout,
- OnGetHardwareInputChannelLayout)
+ IPC_MESSAGE_HANDLER(ViewHostMsg_GetAudioHardwareConfig,
+ OnGetAudioHardwareConfig)
IPC_MESSAGE_HANDLER(ViewHostMsg_GetMonitorColorProfile,
OnGetMonitorColorProfile)
IPC_MESSAGE_HANDLER(ViewHostMsg_MediaLogEvent, OnMediaLogEvent)
@@ -778,24 +772,16 @@ void RenderMessageFilter::OnGetCPUUsage(int* cpu_usage) {
*cpu_usage = cpu_usage_;
}
-void RenderMessageFilter::OnGetHardwareBufferSize(uint32* buffer_size) {
- *buffer_size = static_cast<uint32>(media::GetAudioHardwareBufferSize());
-}
+void RenderMessageFilter::OnGetAudioHardwareConfig(
+ int* output_buffer_size, int* output_sample_rate, int* input_sample_rate,
+ media::ChannelLayout* input_channel_layout) {
+ *output_buffer_size = media::GetAudioHardwareBufferSize();
+ *output_sample_rate = media::GetAudioHardwareSampleRate();
-void RenderMessageFilter::OnGetHardwareInputSampleRate(int* sample_rate) {
// TODO(henrika): add support for all available input devices.
- *sample_rate = media::GetAudioInputHardwareSampleRate(
+ *input_sample_rate = media::GetAudioInputHardwareSampleRate(
media::AudioManagerBase::kDefaultDeviceId);
-}
-
-void RenderMessageFilter::OnGetHardwareSampleRate(int* sample_rate) {
- *sample_rate = media::GetAudioHardwareSampleRate();
-}
-
-void RenderMessageFilter::OnGetHardwareInputChannelLayout(
- media::ChannelLayout* layout) {
- // TODO(henrika): add support for all available input devices.
- *layout = media::GetAudioInputHardwareChannelLayout(
+ *input_channel_layout = media::GetAudioInputHardwareChannelLayout(
media::AudioManagerBase::kDefaultDeviceId);
}
« no previous file with comments | « content/browser/renderer_host/render_message_filter.h ('k') | content/common/media/audio_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698