Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(231)

Unified Diff: content/renderer/media/render_audiosourceprovider.cc

Issue 10636036: Enable renderer side mixing behind a flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove new mixer address != old mixer address test. Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/render_audiosourceprovider.cc
diff --git a/content/renderer/media/render_audiosourceprovider.cc b/content/renderer/media/render_audiosourceprovider.cc
index c0a05806dc3923e09cebdf6fe9789df7abdf7a41..da1e341ba2dea3f46f827b38b6e357280c340b36 100644
--- a/content/renderer/media/render_audiosourceprovider.cc
+++ b/content/renderer/media/render_audiosourceprovider.cc
@@ -5,11 +5,17 @@
#include "content/renderer/media/render_audiosourceprovider.h"
#include "base/basictypes.h"
+#include "base/command_line.h"
#include "base/logging.h"
+#include "content/public/common/content_switches.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 "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProviderClient.h"
using content::AudioDeviceFactory;
+using content::AudioRendererMixerManager;
using std::vector;
using WebKit::WebVector;
@@ -20,11 +26,17 @@ RenderAudioSourceProvider::RenderAudioSourceProvider()
is_running_(false),
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();
+ // 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.
+ const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+ if (cmd_line->HasSwitch(switches::kEnableRendererSideMixing)) {
+ default_sink_ = RenderThreadImpl::current()->
+ GetAudioRendererMixerManager()->CreateInput();
+ } else {
+ default_sink_ = AudioDeviceFactory::Create();
+ }
}
void RenderAudioSourceProvider::setClient(
« no previous file with comments | « content/renderer/media/audio_renderer_mixer_manager_unittest.cc ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698