| Index: media/audio/android/audio_manager_android.cc
|
| diff --git a/media/audio/android/audio_manager_android.cc b/media/audio/android/audio_manager_android.cc
|
| index 0170675a43442425ab0e0d83597ec848707282a1..24ef0af52752ec162690b5a3b2a189964442b410 100644
|
| --- a/media/audio/android/audio_manager_android.cc
|
| +++ b/media/audio/android/audio_manager_android.cc
|
| @@ -8,7 +8,9 @@
|
| #include "media/audio/android/audio_track_output_android.h"
|
| #include "media/audio/audio_manager.h"
|
| #include "media/audio/fake_audio_input_stream.h"
|
| -#include "media/audio/fake_audio_output_stream.h"
|
| +
|
| +// Maximum number of output streams that can be open simultaneously.
|
| +static const int kMaxOutputStreams = 10;
|
|
|
| AudioManager* CreateAudioManager() {
|
| return new AudioManagerAndroid();
|
| @@ -28,29 +30,38 @@ bool AudioManagerAndroid::HasAudioInputDevices() {
|
| return false;
|
| }
|
|
|
| -AudioOutputStream* AudioManagerAndroid::MakeAudioOutputStream(
|
| - const AudioParameters& params) {
|
| - if (!params.IsValid())
|
| - return NULL;
|
| +void AudioManagerAndroid::MuteAll() {
|
| + NOTIMPLEMENTED();
|
| +}
|
|
|
| - if (params.format == AudioParameters::AUDIO_MOCK)
|
| - return FakeAudioOutputStream::MakeFakeStream(params);
|
| - if (params.format == AudioParameters::AUDIO_PCM_LINEAR ||
|
| - params.format == AudioParameters::AUDIO_PCM_LOW_LATENCY)
|
| - return AudioTrackOutputStream::MakeStream(params);
|
| +void AudioManagerAndroid::UnMuteAll() {
|
| + NOTIMPLEMENTED();
|
| +}
|
|
|
| - return NULL;
|
| +int AudioManagerAndroid::GetMaxOutputStreamsAllowed() {
|
| + return kMaxOutputStreams;
|
| }
|
|
|
| -AudioInputStream* AudioManagerAndroid::MakeAudioInputStream(
|
| - const AudioParameters& params, const std::string& device_id) {
|
| - return FakeAudioInputStream::MakeFakeStream(params);
|
| +AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream(
|
| + const AudioParameters& params) {
|
| + DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format);
|
| + return AudioTrackOutputStream::MakeStream(params);
|
| }
|
|
|
| -void AudioManagerAndroid::MuteAll() {
|
| - NOTIMPLEMENTED();
|
| +AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream(
|
| + const AudioParameters& params) {
|
| + DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format);
|
| + return AudioTrackOutputStream::MakeStream(params);
|
| }
|
|
|
| -void AudioManagerAndroid::UnMuteAll() {
|
| - NOTIMPLEMENTED();
|
| +AudioInputStream* AudioManagerAndroid::MakeLinearInputStream(
|
| + const AudioParameters& params, const std::string& device_id) {
|
| + DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format);
|
| + return FakeAudioInputStream::MakeFakeStream(params);
|
| +}
|
| +
|
| +AudioInputStream* AudioManagerAndroid::MakeALowLatencyInputStream(
|
| + const AudioParameters& params, const std::string& device_id) {
|
| + DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format);
|
| + return FakeAudioInputStream::MakeFakeStream(params);
|
| }
|
|
|