content/renderer/media/media_stream_dependency_factory.h - 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/media_stream_dependency_factory.h

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, 10 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

« content/renderer/media/audio_message_filter.cc ('K') | « content/renderer/media/audio_renderer_mixer_manager.cc ('k') | content/renderer/media/media_stream_dependency_factory.cc » ('j') | media/audio/audio_input_device.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_dependency_factory.h

diff --git a/content/renderer/media/media_stream_dependency_factory.h b/content/renderer/media/media_stream_dependency_factory.h

index 918326306e17bfa1e34c9ec035553a59224dfa4d..b58cc6584c70ff456a029b2f57963172c8b08192 100644

--- a/content/renderer/media/media_stream_dependency_factory.h

+++ b/content/renderer/media/media_stream_dependency_factory.h

@@ -71,6 +71,7 @@ class CONTENT_EXPORT MediaStreamDependencyFactory

// WebMediaStreamSource.

// |audio_constraints| and |video_constraints| set parameters for the sources.

void CreateNativeMediaSources(

+ int render_view_id,

const WebKit::WebMediaConstraints& audio_constraints,

const WebKit::WebMediaConstraints& video_constraints,

WebKit::WebMediaStream* description,

@@ -134,7 +135,8 @@ class CONTENT_EXPORT MediaStreamDependencyFactory

// Initializes the source using audio parameters for the selected

// capture device and specifies which capture device to use as capture

// source.

- virtual bool InitializeAudioSource(const StreamDeviceInfo& device_info);

+ virtual bool InitializeAudioSource(int render_view_id,

+ const StreamDeviceInfo& device_info);

// Creates a media::AudioCapturerSource with an implementation that is

// specific for a WebAudio source. The created WebAudioCapturerSource