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

media/audio/android/audio_manager_android.cc

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..57092254c7861fe0c55d52f0f6c353ea56f4dd05 100644
--- a/media/audio/android/audio_manager_android.cc
+++ b/media/audio/android/audio_manager_android.cc
@@ -8,13 +8,17 @@
 #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();
@@ -28,29 +32,34 @@ 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;
+AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream(
+      const AudioParameters& params) {
+  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format);
+  return AudioTrackOutputStream::MakeStream(params);
 }
 
-AudioInputStream* AudioManagerAndroid::MakeAudioInputStream(
-    const AudioParameters& params, const std::string& device_id) {
-  return FakeAudioInputStream::MakeFakeStream(params);
+AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream(
+      const AudioParameters& params) {
+  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format);
+  return AudioTrackOutputStream::MakeStream(params);
 }
 
-void AudioManagerAndroid::MuteAll() {
-  NOTIMPLEMENTED();
+AudioInputStream* AudioManagerAndroid::MakeLinearInputStream(
+    const AudioParameters& params, const std::string& device_id) {
+  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format);
+  return FakeAudioInputStream::MakeFakeStream(params);
 }
 
-void AudioManagerAndroid::UnMuteAll() {
-  NOTIMPLEMENTED();
+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);
 }