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 "build/build_config.h" | 11 #include "build/build_config.h" |
11 #include "content/common/content_constants_internal.h" | 12 #include "content/common/content_constants_internal.h" |
12 #include "content/renderer/media/audio_input_message_filter.h" | 13 #include "content/renderer/media/audio_input_message_filter.h" |
13 #include "content/renderer/media/audio_message_filter.h" | 14 #include "content/renderer/media/audio_message_filter.h" |
14 #include "content/renderer/media/audio_renderer_mixer_manager.h" | 15 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
15 #include "content/renderer/render_thread_impl.h" | 16 #include "content/renderer/render_thread_impl.h" |
16 #include "media/audio/audio_input_device.h" | 17 #include "media/audio/audio_input_device.h" |
17 #include "media/audio/audio_output_device.h" | 18 #include "media/audio/audio_output_device.h" |
18 #include "media/base/audio_latency.h" | 19 #include "media/base/audio_latency.h" |
19 #include "media/base/audio_renderer_mixer_input.h" | 20 #include "media/base/audio_renderer_mixer_input.h" |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
121 session_id, device_id, | 122 session_id, device_id, |
122 security_origin); | 123 security_origin); |
123 if (device) | 124 if (device) |
124 return device; | 125 return device; |
125 } | 126 } |
126 | 127 |
127 if (IsMixable(source_type)) | 128 if (IsMixable(source_type)) |
128 return NewMixableSink(source_type, render_frame_id, session_id, device_id, | 129 return NewMixableSink(source_type, render_frame_id, session_id, device_id, |
129 security_origin); | 130 security_origin); |
130 | 131 |
132 UMA_HISTOGRAM_BOOLEAN("Media.Audio.SinkCache.UsedForSinkCreation", false); | |
Henrik Grunell
2016/07/04 14:24:59
Maybe add "Renderer" to be in line with other hist
o1ka
2016/07/06 13:17:30
Done.
| |
131 return NewFinalAudioRendererSink(render_frame_id, session_id, device_id, | 133 return NewFinalAudioRendererSink(render_frame_id, session_id, device_id, |
132 security_origin); | 134 security_origin); |
133 } | 135 } |
134 | 136 |
135 // static | 137 // static |
136 scoped_refptr<media::SwitchableAudioRendererSink> | 138 scoped_refptr<media::SwitchableAudioRendererSink> |
137 AudioDeviceFactory::NewSwitchableAudioRendererSink( | 139 AudioDeviceFactory::NewSwitchableAudioRendererSink( |
138 SourceType source_type, | 140 SourceType source_type, |
139 int render_frame_id, | 141 int render_frame_id, |
140 int session_id, | 142 int session_id, |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
209 device_id, security_origin); | 211 device_id, security_origin); |
210 if (sink) | 212 if (sink) |
211 return sink; | 213 return sink; |
212 } | 214 } |
213 | 215 |
214 return NewOutputDevice(render_frame_id, session_id, device_id, | 216 return NewOutputDevice(render_frame_id, session_id, device_id, |
215 security_origin); | 217 security_origin); |
216 } | 218 } |
217 | 219 |
218 } // namespace content | 220 } // namespace content |
OLD | NEW |