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

Unified Diff: content/renderer/render_thread_impl.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/renderer/render_thread_impl.h ('k') | content/renderer/renderer_webkitplatformsupport_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 1aa91d7ebbd21457f6c16840aab030e2c67733e8..3381e96844a2a8933091cce5da5bcb693da37ee8 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -55,7 +55,6 @@
#include "content/renderer/gpu/compositor_thread.h"
#include "content/renderer/gpu/compositor_output_surface.h"
#include "content/renderer/gpu/gpu_benchmarking_extension.h"
-#include "content/renderer/media/audio_hardware.h"
#include "content/renderer/media/audio_input_message_filter.h"
#include "content/renderer/media/audio_message_filter.h"
#include "content/renderer/media/audio_renderer_mixer_manager.h"
@@ -73,6 +72,7 @@
#include "ipc/ipc_channel_handle.h"
#include "ipc/ipc_forwarding_message_filter.h"
#include "ipc/ipc_platform_file.h"
+#include "media/base/audio_hardware_config.h"
#include "media/base/media.h"
#include "media/base/media_switches.h"
#include "net/base/net_errors.h"
@@ -904,13 +904,32 @@ RenderThreadImpl::GetGpuVDAContext3D() {
AudioRendererMixerManager* RenderThreadImpl::GetAudioRendererMixerManager() {
if (!audio_renderer_mixer_manager_.get()) {
audio_renderer_mixer_manager_.reset(new AudioRendererMixerManager(
- GetAudioOutputSampleRate(),
- GetAudioOutputBufferSize()));
+ GetAudioHardwareConfig()));
}
return audio_renderer_mixer_manager_.get();
}
+media::AudioHardwareConfig* RenderThreadImpl::GetAudioHardwareConfig() {
+ if (!audio_hardware_config_) {
+ int output_buffer_size;
+ int output_sample_rate;
+ int input_sample_rate;
+ media::ChannelLayout input_channel_layout;
+
+ Send(new ViewHostMsg_GetAudioHardwareConfig(
+ &output_buffer_size, &output_sample_rate,
+ &input_sample_rate, &input_channel_layout));
+
+ audio_hardware_config_.reset(new media::AudioHardwareConfig(
+ output_buffer_size, output_sample_rate, input_sample_rate,
+ input_channel_layout));
+ audio_message_filter_->SetAudioHardwareConfig(audio_hardware_config_.get());
+ }
+
+ return audio_hardware_config_.get();
+}
+
#if defined(OS_WIN)
void RenderThreadImpl::PreCacheFontCharacters(const LOGFONT& log_font,
const string16& str) {
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | content/renderer/renderer_webkitplatformsupport_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698