Enable renderer side mixing behind a flag.

content/renderer/media/render_audiosourceprovider.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 "content/renderer/media/render_audiosourceprovider.h"
 
 #include "base/basictypes.h"
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "content/renderer/media/audio_device_factory.h"
+#include "content/renderer/media/audio_renderer_mixer_manager.h"
+#include "content/renderer/render_thread_impl.h"
+#include "media/base/audio_renderer_mixer_input.h"
+#include "media/base/media_switches.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProviderClient.h"
 
 using content::AudioDeviceFactory;
 using std::vector;
 using WebKit::WebVector;
 
 RenderAudioSourceProvider::RenderAudioSourceProvider()
     : is_initialized_(false),
       channels_(0),
       sample_rate_(0),
       is_running_(false),
       volume_(1.0),
       renderer_(NULL),
       client_(NULL) {
-  // We create the AudioDevice here using the factory. But we don't yet know
-  // the audio format (sample-rate, etc.) at this point.  Later, when
-  // Initialize() is called, we have the audio format information and call
-  // the AudioDevice::Initialize() method to fully initialize it.
-  default_sink_ = AudioDeviceFactory::Create();
+  // Only process the command line switch once.
+  static int enable_render_side_mixing = -1;

[scherkus (not reviewing), 2012/07/13 18:40:16]

don't worry about optimizing the switch lookup on subsequent object creation --
just do the HasSwitch() every time

[DaleCurtis, 2012/07/13 21:28:33]

Done.

+  if (enable_render_side_mixing < 0) {
+    const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+    enable_render_side_mixing = static_cast<int>(cmd_line->HasSwitch(
+        switches::kEnableRendererSideMixing));
+  }
+
+  // We create an AudioRendererSink here, but we don't yet know the audio format
+  // (sample-rate, etc.) at this point.  Later, when Initialize() is called, we
+  // have the audio format information and call AudioRendererSink::Initialize()
+  // to fully initialize it.
+  if (!enable_render_side_mixing) {
+    default_sink_ = AudioDeviceFactory::Create();
+  } else {
+    default_sink_ = RenderThreadImpl::current()->
+        audio_renderer_mixer_manager()->CreateInput();
+  }
 }
 
 void RenderAudioSourceProvider::setClient(
     WebKit::WebAudioSourceProviderClient* client) {
   // Synchronize with other uses of client_ and default_sink_.
   base::AutoLock auto_lock(sink_lock_);
 
   if (client && client != client_) {
     // Detach the audio renderer from normal playback.
     default_sink_->Stop();
@@ skipping 101 matching lines @@
 
   if (client_) {
     // Inform WebKit about the audio stream format.
     client_->setFormat(channels_, sample_rate_);
   }
 
   is_initialized_ = true;
 }
 
 RenderAudioSourceProvider::~RenderAudioSourceProvider() {}