content/renderer/media/audio_renderer_mixer_manager.cc - Issue 12383016: Merge AssociateStreamWithProducer message into CreateStream message for both audio output and input.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12383016: Merge AssociateStreamWithProducer message into CreateStream message for both audio output and input. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 8 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

« no previous file with comments | « content/renderer/media/audio_message_filter_unittest.cc ('k') | content/renderer/media/media_stream_dependency_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 2f2433f820ab7faef042731e08dd886f59b28ca0..7db67d19f86729d2b2e90263d1a07de0d1ba85c6 100644

--- a/content/renderer/media/audio_renderer_mixer_manager.cc

+++ b/content/renderer/media/audio_renderer_mixer_manager.cc

@@ -7,7 +7,7 @@

#include "base/bind.h"

#include "base/bind_helpers.h"

#include "content/renderer/media/audio_device_factory.h"

-#include "content/renderer/media/renderer_audio_output_device.h"

+#include "media/audio/audio_output_device.h"

#include "media/base/audio_hardware_config.h"

#include "media/base/audio_renderer_mixer.h"

#include "media/base/audio_renderer_mixer_input.h"

@@ -77,10 +77,9 @@ media::AudioRendererMixer* AudioRendererMixerManager::GetMixer(

mixer = new media::AudioRendererMixer(

params, output_params, sink_for_testing_);

} else {

- scoped_refptr<RendererAudioOutputDevice> device =

- AudioDeviceFactory::NewOutputDevice();

- device->SetSourceRenderView(source_render_view_id);

- mixer = new media::AudioRendererMixer(params, output_params, device);

+ mixer = new media::AudioRendererMixer(

+ params, output_params, AudioDeviceFactory::NewOutputDevice(

+ source_render_view_id));

}

AudioRendererMixerReference mixer_reference = { mixer, 1 };