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 "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
12 #include "content/common/content_constants_internal.h" | 12 #include "content/common/content_constants_internal.h" |
13 #include "content/renderer/media/audio_input_message_filter.h" | 13 #include "content/renderer/media/audio_input_message_filter.h" |
14 #include "content/renderer/media/audio_message_filter.h" | 14 #include "content/renderer/media/audio_ipc_factory.h" |
15 #include "content/renderer/media/audio_renderer_mixer_manager.h" | 15 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
16 #include "content/renderer/render_thread_impl.h" | 16 #include "content/renderer/render_thread_impl.h" |
17 #include "media/audio/audio_input_device.h" | 17 #include "media/audio/audio_input_device.h" |
18 #include "media/audio/audio_output_device.h" | 18 #include "media/audio/audio_output_device.h" |
19 #include "media/base/audio_renderer_mixer_input.h" | 19 #include "media/base/audio_renderer_mixer_input.h" |
20 #include "media/base/media_switches.h" | 20 #include "media/base/media_switches.h" |
21 #include "url/origin.h" | 21 #include "url/origin.h" |
22 | 22 |
23 namespace content { | 23 namespace content { |
24 | 24 |
(...skipping 11 matching lines...) Expand all Loading... |
36 const int64_t kMaxAuthorizationTimeoutMs = 10000; | 36 const int64_t kMaxAuthorizationTimeoutMs = 10000; |
37 #else | 37 #else |
38 const int64_t kMaxAuthorizationTimeoutMs = 0; // No timeout. | 38 const int64_t kMaxAuthorizationTimeoutMs = 0; // No timeout. |
39 #endif | 39 #endif |
40 | 40 |
41 scoped_refptr<media::AudioOutputDevice> NewOutputDevice( | 41 scoped_refptr<media::AudioOutputDevice> NewOutputDevice( |
42 int render_frame_id, | 42 int render_frame_id, |
43 int session_id, | 43 int session_id, |
44 const std::string& device_id, | 44 const std::string& device_id, |
45 const url::Origin& security_origin) { | 45 const url::Origin& security_origin) { |
46 AudioMessageFilter* const filter = AudioMessageFilter::Get(); | 46 auto device = base::MakeRefCounted<media::AudioOutputDevice>( |
47 scoped_refptr<media::AudioOutputDevice> device(new media::AudioOutputDevice( | 47 AudioIPCFactory::get()->CreateAudioOutputIPC(render_frame_id), |
48 filter->CreateAudioOutputIPC(render_frame_id), filter->io_task_runner(), | 48 AudioIPCFactory::get()->io_task_runner(), session_id, device_id, |
49 session_id, device_id, security_origin, | 49 security_origin, |
50 // Set authorization request timeout at 80% of renderer hung timeout, but | 50 // Set authorization request timeout at 80% of renderer hung timeout, |
51 // no more than kMaxAuthorizationTimeout. | 51 // but no more than kMaxAuthorizationTimeout. |
52 base::TimeDelta::FromMilliseconds(std::min(kHungRendererDelayMs * 8 / 10, | 52 base::TimeDelta::FromMilliseconds( |
53 kMaxAuthorizationTimeoutMs)))); | 53 std::min(kHungRendererDelayMs * 8 / 10, kMaxAuthorizationTimeoutMs))); |
54 device->RequestDeviceAuthorization(); | 54 device->RequestDeviceAuthorization(); |
55 return device; | 55 return device; |
56 } | 56 } |
57 | 57 |
58 // This is where we decide which audio will go to mixers and which one to | 58 // This is where we decide which audio will go to mixers and which one to |
59 // AudioOutpuDevice directly. | 59 // AudioOutpuDevice directly. |
60 bool IsMixable(AudioDeviceFactory::SourceType source_type) { | 60 bool IsMixable(AudioDeviceFactory::SourceType source_type) { |
61 if (source_type == AudioDeviceFactory::kSourceMediaElement) | 61 if (source_type == AudioDeviceFactory::kSourceMediaElement) |
62 return true; // Must ALWAYS go through mixer. | 62 return true; // Must ALWAYS go through mixer. |
63 | 63 |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
215 device_id, security_origin); | 215 device_id, security_origin); |
216 if (sink) | 216 if (sink) |
217 return sink; | 217 return sink; |
218 } | 218 } |
219 | 219 |
220 return NewOutputDevice(render_frame_id, session_id, device_id, | 220 return NewOutputDevice(render_frame_id, session_id, device_id, |
221 security_origin); | 221 security_origin); |
222 } | 222 } |
223 | 223 |
224 } // namespace content | 224 } // namespace content |
OLD | NEW |