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

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

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix various compiler errors Created 8 years, 9 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/audio_manager.h" 9 #include "media/audio/audio_manager.h"
10 #include "media/audio/fake_audio_input_stream.h" 10 #include "media/audio/fake_audio_input_stream.h"
11 11
12 namespace media {
13
12 // Maximum number of output streams that can be open simultaneously. 14 // Maximum number of output streams that can be open simultaneously.
13 static const int kMaxOutputStreams = 10; 15 static const int kMaxOutputStreams = 10;
14 16
15 AudioManager* CreateAudioManager() { 17 AudioManager* CreateAudioManager() {
16 return new AudioManagerAndroid(); 18 return new AudioManagerAndroid();
17 } 19 }
18 20
19 AudioManagerAndroid::AudioManagerAndroid() { 21 AudioManagerAndroid::AudioManagerAndroid() {
20 SetMaxOutputStreamsAllowed(kMaxOutputStreams); 22 SetMaxOutputStreamsAllowed(kMaxOutputStreams);
21 } 23 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 const AudioParameters& params, const std::string& device_id) { 58 const AudioParameters& params, const std::string& device_id) {
57 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format); 59 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format);
58 return FakeAudioInputStream::MakeFakeStream(this, params); 60 return FakeAudioInputStream::MakeFakeStream(this, params);
59 } 61 }
60 62
61 AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream( 63 AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream(
62 const AudioParameters& params, const std::string& device_id) { 64 const AudioParameters& params, const std::string& device_id) {
63 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format); 65 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format);
64 return FakeAudioInputStream::MakeFakeStream(this, params); 66 return FakeAudioInputStream::MakeFakeStream(this, params);
65 } 67 }
68
69 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698