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

Side by Side Diff: media/audio/audio_manager_base.cc

Issue 1362093002: Re-land: Add localized default audio device names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Exclude media_resource_provider on iOS. Created 5 years, 2 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
« no previous file with comments | « media/audio/audio_manager_base.h ('k') | media/audio/audio_manager_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "media/audio/audio_manager_base.h" 5 #include "media/audio/audio_manager_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
11 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
12 #include "base/thread_task_runner_handle.h" 12 #include "base/thread_task_runner_handle.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "media/audio/audio_output_dispatcher_impl.h" 14 #include "media/audio/audio_output_dispatcher_impl.h"
15 #include "media/audio/audio_output_proxy.h" 15 #include "media/audio/audio_output_proxy.h"
16 #include "media/audio/audio_output_resampler.h" 16 #include "media/audio/audio_output_resampler.h"
17 #include "media/audio/fake_audio_input_stream.h" 17 #include "media/audio/fake_audio_input_stream.h"
18 #include "media/audio/fake_audio_output_stream.h" 18 #include "media/audio/fake_audio_output_stream.h"
19 #include "media/base/media_switches.h" 19 #include "media/base/media_switches.h"
20 20
21 namespace media { 21 namespace media {
22 namespace {
22 23
23 static const int kStreamCloseDelaySeconds = 5; 24 const int kStreamCloseDelaySeconds = 5;
24 25
25 // Default maximum number of output streams that can be open simultaneously 26 // Default maximum number of output streams that can be open simultaneously
26 // for all platforms. 27 // for all platforms.
27 static const int kDefaultMaxOutputStreams = 16; 28 const int kDefaultMaxOutputStreams = 16;
28 29
29 // Default maximum number of input streams that can be open simultaneously 30 // Default maximum number of input streams that can be open simultaneously
30 // for all platforms. 31 // for all platforms.
31 static const int kDefaultMaxInputStreams = 16; 32 const int kDefaultMaxInputStreams = 16;
32 33
33 static const int kMaxInputChannels = 3; 34 const int kMaxInputChannels = 3;
34 35
35 const char AudioManagerBase::kDefaultDeviceName[] = "Default"; 36 } // namespace
37
36 const char AudioManagerBase::kDefaultDeviceId[] = "default"; 38 const char AudioManagerBase::kDefaultDeviceId[] = "default";
37 const char AudioManagerBase::kCommunicationsDeviceId[] = "communications"; 39 const char AudioManagerBase::kCommunicationsDeviceId[] = "communications";
38 const char AudioManagerBase::kCommunicationsDeviceName[] = "Communications";
39 const char AudioManagerBase::kLoopbackInputDeviceId[] = "loopback"; 40 const char AudioManagerBase::kLoopbackInputDeviceId[] = "loopback";
40 41
41 struct AudioManagerBase::DispatcherParams { 42 struct AudioManagerBase::DispatcherParams {
42 DispatcherParams(const AudioParameters& input, 43 DispatcherParams(const AudioParameters& input,
43 const AudioParameters& output, 44 const AudioParameters& output,
44 const std::string& output_device_id) 45 const std::string& output_device_id)
45 : input_params(input), 46 : input_params(input),
46 output_params(output), 47 output_params(output),
47 output_device_id(output_device_id) {} 48 output_device_id(output_device_id) {}
48 ~DispatcherParams() {} 49 ~DispatcherParams() {}
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 scoped_ptr<AudioLog> AudioManagerBase::CreateAudioLog( 408 scoped_ptr<AudioLog> AudioManagerBase::CreateAudioLog(
408 AudioLogFactory::AudioComponent component) { 409 AudioLogFactory::AudioComponent component) {
409 return audio_log_factory_->CreateAudioLog(component); 410 return audio_log_factory_->CreateAudioLog(component);
410 } 411 }
411 412
412 void AudioManagerBase::SetHasKeyboardMic() { 413 void AudioManagerBase::SetHasKeyboardMic() {
413 NOTREACHED(); 414 NOTREACHED();
414 } 415 }
415 416
416 } // namespace media 417 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/audio_manager_base.h ('k') | media/audio/audio_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698