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

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

Issue 10835025: Plumb render view ID to media observer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/audio_renderer_mixer_manager.cc
diff --git a/content/renderer/media/audio_renderer_mixer_manager.cc b/content/renderer/media/audio_renderer_mixer_manager.cc
index 03e638e7799dafc54074c53e6c8da9800a72fc19..ee3903a3e4b99adb15244e4de3d15d75fee364a1 100644
--- a/content/renderer/media/audio_renderer_mixer_manager.cc
+++ b/content/renderer/media/audio_renderer_mixer_manager.cc
@@ -10,27 +10,35 @@
#include "media/base/audio_renderer_mixer.h"
#include "media/base/audio_renderer_mixer_input.h"
+void MyFunc(int i, const std::string& str) {}
+
namespace content {
AudioRendererMixerManager::AudioRendererMixerManager(int hardware_sample_rate,
int hardware_buffer_size)
: hardware_sample_rate_(hardware_sample_rate),
hardware_buffer_size_(hardware_buffer_size) {
+ base::Callback<void(const std::string&)> cb = base::Bind(&MyFunc, 23);
+ cb.Run("hello world");
}
AudioRendererMixerManager::~AudioRendererMixerManager() {
DCHECK(mixers_.empty());
}
-media::AudioRendererMixerInput* AudioRendererMixerManager::CreateInput() {
+media::AudioRendererMixerInput* AudioRendererMixerManager::CreateInput(
+ RenderView* render_view) {
return new media::AudioRendererMixerInput(
base::Bind(
- &AudioRendererMixerManager::GetMixer, base::Unretained(this)),
+ &AudioRendererMixerManager::GetMixer,
+ base::Unretained(this),
+ base::Unretained(render_view)),
base::Bind(
&AudioRendererMixerManager::RemoveMixer, base::Unretained(this)));
}
media::AudioRendererMixer* AudioRendererMixerManager::GetMixer(
+ RenderView* render_view,
const media::AudioParameters& params) {
base::AutoLock auto_lock(mixers_lock_);
@@ -48,7 +56,7 @@ media::AudioRendererMixer* AudioRendererMixerManager::GetMixer(
hardware_sample_rate_, 16, hardware_buffer_size_);
media::AudioRendererMixer* mixer = new media::AudioRendererMixer(
- params, output_params, AudioDeviceFactory::Create());
+ params, output_params, AudioDeviceFactory::Create(render_view));
AudioRendererMixerReference mixer_reference = { mixer, 1 };
mixers_[params] = mixer_reference;
« no previous file with comments | « content/renderer/media/audio_renderer_mixer_manager.h ('k') | content/renderer/media/media_stream_dependency_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698