Introduce AudioOutputResampler for browser side resampling.

media/audio/audio_manager_base.cc

 // Copyright (c) 2012 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/audio_manager_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop_proxy.h"
 #include "base/threading/thread.h"
 #include "media/audio/audio_output_dispatcher_impl.h"
 #include "media/audio/audio_output_proxy.h"
+#include "media/audio/audio_output_resampler.h"
+#include "media/audio/audio_util.h"
 #include "media/audio/fake_audio_input_stream.h"
 #include "media/audio/fake_audio_output_stream.h"
 #include "media/base/media_switches.h"
 
 // TODO(dalecurtis): Temporarily disabled while switching pipeline to use float,
 // http://crbug.com/114700
 #if defined(ENABLE_AUDIO_MIXER)
 #include "media/audio/audio_output_mixer.h"
 #endif
 
@@ skipping 122 matching lines @@
   NOTIMPLEMENTED();
   return NULL;
 #else
   DCHECK(GetMessageLoop()->BelongsToCurrentThread());
 
   scoped_refptr<AudioOutputDispatcher>& dispatcher =
       output_dispatchers_[params];
   if (!dispatcher) {
     base::TimeDelta close_delay =
         base::TimeDelta::FromSeconds(kStreamCloseDelaySeconds);
+    const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+    if (cmd_line->HasSwitch(switches::kEnableAudioOutputResampler)) {
+      dispatcher = new AudioOutputResampler(
+          this, params,
+          GetPreferredLowLatencyOutputStreamParameters(params.channel_layout()),
+          close_delay);

[scherkus (not reviewing), 2012/09/10 12:47:47]

I think we can clean up the confusing #if code if we returned the new
AOP(dispatcher) here + deleted the else branch

[DaleCurtis, 2012/09/10 14:05:51]

Done.

+    } else
+#if defined(ENABLE_AUDIO_MIXER)
     // TODO(dalecurtis): Browser side mixing has a couple issues that must be
     // fixed before it can be turned on by default: http://crbug.com/138098 and
     // http://crbug.com/140247
-#if defined(ENABLE_AUDIO_MIXER)
-    const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-    if (cmd_line->HasSwitch(switches::kEnableAudioMixer))
+           if (cmd_line->HasSwitch(switches::kEnableAudioMixer)) {
       dispatcher = new AudioOutputMixer(this, params, close_delay);
-    else
+    } else
 #endif
       dispatcher = new AudioOutputDispatcherImpl(this, params, close_delay);
   }
   return new AudioOutputProxy(dispatcher);
 #endif  // defined(OS_IOS)
 }
 
 bool AudioManagerBase::CanShowAudioInputSettings() {
   return false;
 }
@@ skipping 79 matching lines @@
       // So, better crash now than later.
       DCHECK(dispatcher->HasOneRef()) << "AudioOutputProxies are still alive";
       dispatcher = NULL;
     }
   }
 
   output_dispatchers_.clear();
 #endif  // defined(OS_IOS)
 }
 
+AudioParameters AudioManagerBase::GetPreferredLowLatencyOutputStreamParameters(
+    ChannelLayout channel_layout) {
+  // TODO(dalecurtis): This should include bits per channel and channel layout
+  // eventually.
+  return AudioParameters(
+      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
+      GetAudioHardwareSampleRate(), 16, GetAudioHardwareBufferSize());
+}
+
 }  // namespace media