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

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

Issue 1314803003: Include default communication devices in audio device enumerations. This removes heuristic that pic… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comment Created 5 years, 3 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/win/audio_low_latency_input_win.h » ('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"
(...skipping 16 matching lines...) Expand all
27 static const int kDefaultMaxOutputStreams = 16; 27 static const int kDefaultMaxOutputStreams = 16;
28 28
29 // Default maximum number of input streams that can be open simultaneously 29 // Default maximum number of input streams that can be open simultaneously
30 // for all platforms. 30 // for all platforms.
31 static const int kDefaultMaxInputStreams = 16; 31 static const int kDefaultMaxInputStreams = 16;
32 32
33 static const int kMaxInputChannels = 3; 33 static const int kMaxInputChannels = 3;
34 34
35 const char AudioManagerBase::kDefaultDeviceName[] = "Default"; 35 const char AudioManagerBase::kDefaultDeviceName[] = "Default";
36 const char AudioManagerBase::kDefaultDeviceId[] = "default"; 36 const char AudioManagerBase::kDefaultDeviceId[] = "default";
37 const char AudioManagerBase::kCommunicationsDeviceId[] = "communications";
38 const char AudioManagerBase::kCommunicationsDeviceName[] = "Communications";
37 const char AudioManagerBase::kLoopbackInputDeviceId[] = "loopback"; 39 const char AudioManagerBase::kLoopbackInputDeviceId[] = "loopback";
38 40
39 struct AudioManagerBase::DispatcherParams { 41 struct AudioManagerBase::DispatcherParams {
40 DispatcherParams(const AudioParameters& input, 42 DispatcherParams(const AudioParameters& input,
41 const AudioParameters& output, 43 const AudioParameters& output,
42 const std::string& output_device_id) 44 const std::string& output_device_id)
43 : input_params(input), 45 : input_params(input),
44 output_params(output), 46 output_params(output),
45 output_device_id(output_device_id) {} 47 output_device_id(output_device_id) {}
46 ~DispatcherParams() {} 48 ~DispatcherParams() {}
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 scoped_ptr<AudioLog> AudioManagerBase::CreateAudioLog( 413 scoped_ptr<AudioLog> AudioManagerBase::CreateAudioLog(
412 AudioLogFactory::AudioComponent component) { 414 AudioLogFactory::AudioComponent component) {
413 return audio_log_factory_->CreateAudioLog(component); 415 return audio_log_factory_->CreateAudioLog(component);
414 } 416 }
415 417
416 void AudioManagerBase::SetHasKeyboardMic() { 418 void AudioManagerBase::SetHasKeyboardMic() {
417 NOTREACHED(); 419 NOTREACHED();
418 } 420 }
419 421
420 } // namespace media 422 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/audio_manager_base.h ('k') | media/audio/win/audio_low_latency_input_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698