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

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

Issue 2821203005: Add a mojo implementation of AudioOutputIPC. (Closed)
Patch Set: Created 3 years, 8 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"
15 #include "content/public/common/content_features.h"
13 #include "content/renderer/media/audio_input_message_filter.h" 16 #include "content/renderer/media/audio_input_message_filter.h"
17 #include "content/renderer/media/audio_ipc_factory.h"
14 #include "content/renderer/media/audio_message_filter.h" 18 #include "content/renderer/media/audio_message_filter.h"
15 #include "content/renderer/media/audio_renderer_mixer_manager.h" 19 #include "content/renderer/media/audio_renderer_mixer_manager.h"
16 #include "content/renderer/render_thread_impl.h" 20 #include "content/renderer/render_thread_impl.h"
17 #include "media/audio/audio_input_device.h" 21 #include "media/audio/audio_input_device.h"
18 #include "media/audio/audio_output_device.h" 22 #include "media/audio/audio_output_device.h"
19 #include "media/base/audio_renderer_mixer_input.h" 23 #include "media/base/audio_renderer_mixer_input.h"
20 #include "media/base/media_switches.h" 24 #include "media/base/media_switches.h"
21 #include "url/origin.h" 25 #include "url/origin.h"
22 26
23 namespace content { 27 namespace content {
(...skipping 11 matching lines...) Expand all
35 const int64_t kMaxAuthorizationTimeoutMs = 10000; 39 const int64_t kMaxAuthorizationTimeoutMs = 10000;
36 #else 40 #else
37 const int64_t kMaxAuthorizationTimeoutMs = 0; // No timeout. 41 const int64_t kMaxAuthorizationTimeoutMs = 0; // No timeout.
38 #endif 42 #endif
39 43
40 scoped_refptr<media::AudioOutputDevice> NewOutputDevice( 44 scoped_refptr<media::AudioOutputDevice> NewOutputDevice(
41 int render_frame_id, 45 int render_frame_id,
42 int session_id, 46 int session_id,
43 const std::string& device_id, 47 const std::string& device_id,
44 const url::Origin& security_origin) { 48 const url::Origin& security_origin) {
45 AudioMessageFilter* const filter = AudioMessageFilter::Get(); 49 std::unique_ptr<media::AudioOutputIPC> ipc;
46 scoped_refptr<media::AudioOutputDevice> device(new media::AudioOutputDevice( 50 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner;
47 filter->CreateAudioOutputIPC(render_frame_id), filter->io_task_runner(), 51 if (base::FeatureList::IsEnabled(
48 session_id, device_id, security_origin, 52 features::kUseMojoAudioOutputStreamFactory)) {
49 // Set authorization request timeout at 80% of renderer hung timeout, but 53 ipc = AudioIPCFactory::get()->CreateAudioOutputIPC(render_frame_id);
50 // no more than kMaxAuthorizationTimeout. 54 io_task_runner = AudioIPCFactory::get()->io_task_runner();
51 base::TimeDelta::FromMilliseconds(std::min(kHungRendererDelayMs * 8 / 10, 55 } else {
52 kMaxAuthorizationTimeoutMs)))); 56 AudioMessageFilter* const filter = AudioMessageFilter::Get();
57 ipc = filter->CreateAudioOutputIPC(render_frame_id);
58 io_task_runner = filter->io_task_runner();
59 }
60 scoped_refptr<media::AudioOutputDevice> device = new media::AudioOutputDevice(
61 std::move(ipc), io_task_runner, session_id, device_id, security_origin,
62 // Set authorization request timeout at 80% of renderer hung timeout,
63 // but no more than kMaxAuthorizationTimeout.
64 base::TimeDelta::FromMilliseconds(
65 std::min(kHungRendererDelayMs * 8 / 10, kMaxAuthorizationTimeoutMs)));
53 device->RequestDeviceAuthorization(); 66 device->RequestDeviceAuthorization();
54 return device; 67 return device;
55 } 68 }
56 69
57 // This is where we decide which audio will go to mixers and which one to 70 // This is where we decide which audio will go to mixers and which one to
58 // AudioOutpuDevice directly. 71 // AudioOutpuDevice directly.
59 bool IsMixable(AudioDeviceFactory::SourceType source_type) { 72 bool IsMixable(AudioDeviceFactory::SourceType source_type) {
60 if (source_type == AudioDeviceFactory::kSourceMediaElement) 73 if (source_type == AudioDeviceFactory::kSourceMediaElement)
61 return true; // Must ALWAYS go through mixer. 74 return true; // Must ALWAYS go through mixer.
62 75
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 device_id, security_origin); 227 device_id, security_origin);
215 if (sink) 228 if (sink)
216 return sink; 229 return sink;
217 } 230 }
218 231
219 return NewOutputDevice(render_frame_id, session_id, device_id, 232 return NewOutputDevice(render_frame_id, session_id, device_id,
220 security_origin); 233 security_origin);
221 } 234 }
222 235
223 } // namespace content 236 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698