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

Side by Side Diff: content/renderer/media/audio_device_factory.cc

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

Powered by Google App Engine
This is Rietveld 408576698