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

Side by Side Diff: media/audio/android/audio_manager_android.cc

Issue 9965076: Revert 130180 - Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
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/android/audio_manager_android.h" 5 #include "media/audio/android/audio_manager_android.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/audio/android/audio_track_output_android.h" 8 #include "media/audio/android/audio_track_output_android.h"
9 #include "media/audio/android/opensles_input.h" 9 #include "media/audio/android/opensles_input.h"
10 #include "media/audio/android/opensles_output.h" 10 #include "media/audio/android/opensles_output.h"
11 #include "media/audio/audio_manager.h" 11 #include "media/audio/audio_manager.h"
12 #include "media/audio/fake_audio_input_stream.h" 12 #include "media/audio/fake_audio_input_stream.h"
13 13
14 namespace media {
15
16 // Maximum number of output streams that can be open simultaneously. 14 // Maximum number of output streams that can be open simultaneously.
17 static const int kMaxOutputStreams = 10; 15 static const int kMaxOutputStreams = 10;
18 16
19 AudioManager* CreateAudioManager() { 17 AudioManager* CreateAudioManager() {
20 return new AudioManagerAndroid(); 18 return new AudioManagerAndroid();
21 } 19 }
22 20
23 AudioManagerAndroid::AudioManagerAndroid() { 21 AudioManagerAndroid::AudioManagerAndroid() {
24 SetMaxOutputStreamsAllowed(kMaxOutputStreams); 22 SetMaxOutputStreamsAllowed(kMaxOutputStreams);
25 } 23 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 const AudioParameters& params, const std::string& device_id) { 58 const AudioParameters& params, const std::string& device_id) {
61 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 59 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
62 return new OpenSLESInputStream(this, params); 60 return new OpenSLESInputStream(this, params);
63 } 61 }
64 62
65 AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream( 63 AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream(
66 const AudioParameters& params, const std::string& device_id) { 64 const AudioParameters& params, const std::string& device_id) {
67 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 65 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
68 return new OpenSLESInputStream(this, params); 66 return new OpenSLESInputStream(this, params);
69 } 67 }
70
71 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/android/audio_manager_android.h ('k') | media/audio/android/audio_track_output_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698