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

Side by Side Diff: media/audio/mac/audio_manager_mac.cc

Issue 10834033: Move AudioDevice and AudioInputDevice to media. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments and fixed a few lint issues Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « media/audio/audio_output_ipc.h ('k') | media/audio/scoped_loop_observer.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 <CoreAudio/AudioHardware.h> 5 #include <CoreAudio/AudioHardware.h>
6 6
7 #include <string>
8
7 #include "base/mac/mac_logging.h" 9 #include "base/mac/mac_logging.h"
8 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
9 #include "base/mac/scoped_cftyperef.h" 11 #include "base/mac/scoped_cftyperef.h"
10 #include "base/sys_string_conversions.h" 12 #include "base/sys_string_conversions.h"
11 #include "media/audio/mac/audio_input_mac.h" 13 #include "media/audio/mac/audio_input_mac.h"
12 #include "media/audio/mac/audio_low_latency_input_mac.h" 14 #include "media/audio/mac/audio_low_latency_input_mac.h"
13 #include "media/audio/mac/audio_low_latency_output_mac.h" 15 #include "media/audio/mac/audio_low_latency_output_mac.h"
14 #include "media/audio/mac/audio_manager_mac.h" 16 #include "media/audio/mac/audio_manager_mac.h"
15 #include "media/audio/mac/audio_output_mac.h" 17 #include "media/audio/mac/audio_output_mac.h"
16 #include "media/base/limits.h" 18 #include "media/base/limits.h"
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 277
276 AudioInputStream* AudioManagerMac::MakeLinearInputStream( 278 AudioInputStream* AudioManagerMac::MakeLinearInputStream(
277 const AudioParameters& params, const std::string& device_id) { 279 const AudioParameters& params, const std::string& device_id) {
278 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 280 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
279 return new PCMQueueInAudioInputStream(this, params); 281 return new PCMQueueInAudioInputStream(this, params);
280 } 282 }
281 283
282 AudioInputStream* AudioManagerMac::MakeLowLatencyInputStream( 284 AudioInputStream* AudioManagerMac::MakeLowLatencyInputStream(
283 const AudioParameters& params, const std::string& device_id) { 285 const AudioParameters& params, const std::string& device_id) {
284 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 286 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
285 // Gets the AudioDeviceID that refers to the AudioDevice with the device 287 // Gets the AudioDeviceID that refers to the AudioOutputDevice with the device
286 // unique id. This AudioDeviceID is used to set the device for Audio Unit. 288 // unique id. This AudioDeviceID is used to set the device for Audio Unit.
287 AudioDeviceID audio_device_id = GetAudioDeviceIdByUId(true, device_id); 289 AudioDeviceID audio_device_id = GetAudioDeviceIdByUId(true, device_id);
288 AudioInputStream* stream = NULL; 290 AudioInputStream* stream = NULL;
289 if (audio_device_id != kAudioObjectUnknown) 291 if (audio_device_id != kAudioObjectUnknown)
290 stream = new AUAudioInputStream(this, params, audio_device_id); 292 stream = new AUAudioInputStream(this, params, audio_device_id);
291 293
292 return stream; 294 return stream;
293 } 295 }
294 296
295 AudioManager* CreateAudioManager() { 297 AudioManager* CreateAudioManager() {
296 return new AudioManagerMac(); 298 return new AudioManagerMac();
297 } 299 }
298 300
299 } // namespace media 301 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/audio_output_ipc.h ('k') | media/audio/scoped_loop_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698