content/renderer/media/media_stream_dependency_factory.cc - Issue 14346002: Connect webrtc MediaSourceInterface ready states with webkit WebMediaStreamSource

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.cc

Issue 14346002: Connect webrtc MediaSourceInterface ready states with webkit WebMediaStreamSource (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: 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/content_renderer.gypi ('k') | content/renderer/media/media_stream_dependency_factory_unittest.cc » ('j') | content/renderer/media/media_stream_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_dependency_factory.cc

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

index 9045b71b89c08b0106f1c010b27092030a6a815c..1a27722787ded5420c277f185b215d6c63e37a98 100644

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

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

@@ -9,6 +9,7 @@

#include "base/synchronization/waitable_event.h"

#include "base/utf_string_conversions.h"

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

+#include "content/renderer/media/media_stream_source_observer.h"

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

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

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

@@ -264,6 +265,10 @@ void MediaStreamDependencyFactory::CreateNativeMediaSources(

CreateLocalVideoSource(source_data->device_info().session_id,

is_screencast,

&native_video_constraints));

+ source_data->SetSourceObserver(new MediaStreamSourceObserver(

+ source_data->video_source(),

+ video_tracks[i].source()));

source_observer->AddSource(source_data->video_source());

}