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/media/audio_device_factory.h" | 5 #include "content/renderer/media/audio_device_factory.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "build/build_config.h" |
10 #include "content/common/content_constants_internal.h" | 11 #include "content/common/content_constants_internal.h" |
11 #include "content/renderer/media/audio_input_message_filter.h" | 12 #include "content/renderer/media/audio_input_message_filter.h" |
12 #include "content/renderer/media/audio_message_filter.h" | 13 #include "content/renderer/media/audio_message_filter.h" |
13 #include "content/renderer/media/audio_renderer_mixer_manager.h" | 14 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
14 #include "content/renderer/render_thread_impl.h" | 15 #include "content/renderer/render_thread_impl.h" |
15 #include "media/audio/audio_input_device.h" | 16 #include "media/audio/audio_input_device.h" |
16 #include "media/audio/audio_output_device.h" | 17 #include "media/audio/audio_output_device.h" |
17 #include "media/base/audio_latency.h" | 18 #include "media/base/audio_latency.h" |
18 #include "media/base/audio_renderer_mixer_input.h" | 19 #include "media/base/audio_renderer_mixer_input.h" |
19 #include "url/origin.h" | 20 #include "url/origin.h" |
20 | 21 |
21 namespace content { | 22 namespace content { |
22 | 23 |
23 // static | 24 // static |
24 AudioDeviceFactory* AudioDeviceFactory::factory_ = NULL; | 25 AudioDeviceFactory* AudioDeviceFactory::factory_ = NULL; |
25 | 26 |
26 namespace { | 27 namespace { |
27 const int64_t kMaxAuthorizationTimeoutMs = 4000; | 28 #if defined(OS_WIN) |
| 29 // Due to driver deadlock issues on Windows (http://crbug/422522) there is a |
| 30 // chance device authorization response is never received from the browser side. |
| 31 // In this case we will time out, to avoid renderer hang forever waiting for |
| 32 // device authorization (http://crbug/615589). This will result in "no audio". |
| 33 const int64_t kMaxAuthorizationTimeoutMs = 900; |
| 34 #else |
| 35 const int64_t kMaxAuthorizationTimeoutMs = 0; // No timeout. |
| 36 #endif // defined(OS_WIN) |
28 | 37 |
29 media::AudioLatency::LatencyType GetSourceLatencyType( | 38 media::AudioLatency::LatencyType GetSourceLatencyType( |
30 AudioDeviceFactory::SourceType source) { | 39 AudioDeviceFactory::SourceType source) { |
31 switch (source) { | 40 switch (source) { |
32 case AudioDeviceFactory::kSourceWebAudioInteractive: | 41 case AudioDeviceFactory::kSourceWebAudioInteractive: |
33 return media::AudioLatency::LATENCY_INTERACTIVE; | 42 return media::AudioLatency::LATENCY_INTERACTIVE; |
34 case AudioDeviceFactory::kSourceNone: | 43 case AudioDeviceFactory::kSourceNone: |
35 case AudioDeviceFactory::kSourceWebRtc: | 44 case AudioDeviceFactory::kSourceWebRtc: |
36 case AudioDeviceFactory::kSourceNonRtcAudioTrack: | 45 case AudioDeviceFactory::kSourceNonRtcAudioTrack: |
37 case AudioDeviceFactory::kSourceWebAudioBalanced: | 46 case AudioDeviceFactory::kSourceWebAudioBalanced: |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 device_id, security_origin); | 209 device_id, security_origin); |
201 if (sink) | 210 if (sink) |
202 return sink; | 211 return sink; |
203 } | 212 } |
204 | 213 |
205 return NewOutputDevice(render_frame_id, session_id, device_id, | 214 return NewOutputDevice(render_frame_id, session_id, device_id, |
206 security_origin); | 215 security_origin); |
207 } | 216 } |
208 | 217 |
209 } // namespace content | 218 } // namespace content |
OLD | NEW |