Move some generic functions to AudioManagerBase to be inherited by platform-specific AudioManager***

media/audio/android/audio_manager_android.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/android/audio_manager_android.h"
 
 #include "base/logging.h"
 #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();
 }
 
-AudioManagerAndroid::AudioManagerAndroid() {}
+AudioManagerAndroid::AudioManagerAndroid() {
+  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
+}
 
 AudioManagerAndroid::~AudioManagerAndroid() {
   audio_thread_->Stop();
 }
 
 bool AudioManagerAndroid::HasAudioOutputDevices() {
   return true;
 }
 
 bool AudioManagerAndroid::HasAudioInputDevices() {
   return false;
 }
 
-AudioOutputStream* AudioManagerAndroid::MakeAudioOutputStream(
-    const AudioParameters& params) {
-  if (!params.IsValid())
-    return NULL;
-
-  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);
-
-  return NULL;
-}
-
-AudioInputStream* AudioManagerAndroid::MakeAudioInputStream(
-    const AudioParameters& params, const std::string& device_id) {
-  return FakeAudioInputStream::MakeFakeStream(params);
-}
-
 void AudioManagerAndroid::MuteAll() {
   NOTIMPLEMENTED();
 }
 
 void AudioManagerAndroid::UnMuteAll() {
   NOTIMPLEMENTED();
 }
+
+AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream(
+      const AudioParameters& params) {
+  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format);
+  return AudioTrackOutputStream::MakeStream(params);
+}
+
+AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream(
+      const AudioParameters& params) {
+  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format);
+  return AudioTrackOutputStream::MakeStream(params);
+}
+
+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(

[scherkus (not reviewing), 2012/03/06 22:31:51]

typo?  "MakeA..." --> "Make..." ?

[no longer working on chromium, 2012/03/07 09:57:08]

Thanks, some uncleaned code when doing the changes.

Fixed now.

+    const AudioParameters& params, const std::string& device_id) {
+  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format);
+  return FakeAudioInputStream::MakeFakeStream(params);
+}