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 #include "content/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <vector> | 10 #include <vector> |
(...skipping 962 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
973 if (!audio_renderer_mixer_manager_.get()) { | 973 if (!audio_renderer_mixer_manager_.get()) { |
974 audio_renderer_mixer_manager_.reset(new AudioRendererMixerManager( | 974 audio_renderer_mixer_manager_.reset(new AudioRendererMixerManager( |
975 GetAudioHardwareConfig())); | 975 GetAudioHardwareConfig())); |
976 } | 976 } |
977 | 977 |
978 return audio_renderer_mixer_manager_.get(); | 978 return audio_renderer_mixer_manager_.get(); |
979 } | 979 } |
980 | 980 |
981 media::AudioHardwareConfig* RenderThreadImpl::GetAudioHardwareConfig() { | 981 media::AudioHardwareConfig* RenderThreadImpl::GetAudioHardwareConfig() { |
982 if (!audio_hardware_config_) { | 982 if (!audio_hardware_config_) { |
983 media::AudioParameters input_params; | 983 int output_buffer_size; |
984 media::AudioParameters output_params; | 984 int output_sample_rate; |
| 985 int input_sample_rate; |
| 986 media::ChannelLayout input_channel_layout; |
| 987 |
985 Send(new ViewHostMsg_GetAudioHardwareConfig( | 988 Send(new ViewHostMsg_GetAudioHardwareConfig( |
986 &input_params, &output_params)); | 989 &output_buffer_size, &output_sample_rate, |
| 990 &input_sample_rate, &input_channel_layout)); |
987 | 991 |
988 audio_hardware_config_.reset(new media::AudioHardwareConfig( | 992 audio_hardware_config_.reset(new media::AudioHardwareConfig( |
989 input_params, output_params)); | 993 output_buffer_size, output_sample_rate, input_sample_rate, |
| 994 input_channel_layout)); |
990 audio_message_filter_->SetAudioHardwareConfig(audio_hardware_config_.get()); | 995 audio_message_filter_->SetAudioHardwareConfig(audio_hardware_config_.get()); |
991 } | 996 } |
992 | 997 |
993 return audio_hardware_config_.get(); | 998 return audio_hardware_config_.get(); |
994 } | 999 } |
995 | 1000 |
996 #if defined(OS_WIN) | 1001 #if defined(OS_WIN) |
997 void RenderThreadImpl::PreCacheFontCharacters(const LOGFONT& log_font, | 1002 void RenderThreadImpl::PreCacheFontCharacters(const LOGFONT& log_font, |
998 const string16& str) { | 1003 const string16& str) { |
999 Send(new ViewHostMsg_PreCacheFontCharacters(log_font, str)); | 1004 Send(new ViewHostMsg_PreCacheFontCharacters(log_font, str)); |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1268 | 1273 |
1269 void RenderThreadImpl::SetFlingCurveParameters( | 1274 void RenderThreadImpl::SetFlingCurveParameters( |
1270 const std::vector<float>& new_touchpad, | 1275 const std::vector<float>& new_touchpad, |
1271 const std::vector<float>& new_touchscreen) { | 1276 const std::vector<float>& new_touchscreen) { |
1272 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1277 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1273 new_touchscreen); | 1278 new_touchscreen); |
1274 | 1279 |
1275 } | 1280 } |
1276 | 1281 |
1277 } // namespace content | 1282 } // namespace content |
OLD | NEW |