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

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

Issue 9655023: Adding input and output audio backend to Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased && addressed qinmin's comments 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"
10 #include "media/audio/android/opensles_output.h"
9 #include "media/audio/audio_manager.h" 11 #include "media/audio/audio_manager.h"
10 #include "media/audio/fake_audio_input_stream.h" 12 #include "media/audio/fake_audio_input_stream.h"
11 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
(...skipping 17 matching lines...) Expand all
36 NOTIMPLEMENTED(); 38 NOTIMPLEMENTED();
37 } 39 }
38 40
39 void AudioManagerAndroid::UnMuteAll() { 41 void AudioManagerAndroid::UnMuteAll() {
40 NOTIMPLEMENTED(); 42 NOTIMPLEMENTED();
41 } 43 }
42 44
43 AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream( 45 AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream(
44 const AudioParameters& params) { 46 const AudioParameters& params) {
45 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 47 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
46 return AudioTrackOutputStream::MakeStream(params); 48 return new OpenSLESOutputStream(this, params);
47 } 49 }
48 50
49 AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream( 51 AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream(
50 const AudioParameters& params) { 52 const AudioParameters& params) {
51 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 53 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
52 return AudioTrackOutputStream::MakeStream(params); 54 return new OpenSLESOutputStream(this, params);
53 } 55 }
54 56
55 AudioInputStream* AudioManagerAndroid::MakeLinearInputStream( 57 AudioInputStream* AudioManagerAndroid::MakeLinearInputStream(
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 new OpenSLESInputStream(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 new OpenSLESInputStream(this, params);
65 } 67 }
OLDNEW
« no previous file with comments | « no previous file | media/audio/android/audio_track_output_android.h » ('j') | media/audio/android/opensles_input.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698