trunk/src/content/renderer/media/media_stream_dependency_factory.h - Issue 135683002: Revert 244074 "Eliminate video capture thread in renderer"

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

Issue 135683002: Revert 244074 "Eliminate video capture thread in renderer" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 11 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:

Index: trunk/src/content/renderer/media/media_stream_dependency_factory.h

===================================================================

--- trunk/src/content/renderer/media/media_stream_dependency_factory.h (revision 244357)

+++ trunk/src/content/renderer/media/media_stream_dependency_factory.h (working copy)

@@ -46,6 +46,7 @@

class IpcNetworkManager;

class IpcPacketSocketFactory;

class RTCMediaConstraints;

+class VideoCaptureImplManager;

class WebAudioCapturerSource;

class WebRtcAudioCapturer;

class WebRtcAudioDeviceImpl;

@@ -66,6 +67,7 @@

typedef base::Callback<void(blink::WebMediaStream* web_stream,

bool live)> MediaSourcesCreatedCallback;

MediaStreamDependencyFactory(

+ VideoCaptureImplManager* vc_manager,

P2PSocketDispatcher* p2p_socket_dispatcher);

virtual ~MediaStreamDependencyFactory();

@@ -253,6 +255,7 @@

RTCVideoDecoderFactoryTv* decoder_factory_tv_;

#endif

+ scoped_refptr<VideoCaptureImplManager> vc_manager_;

scoped_refptr<P2PSocketDispatcher> p2p_socket_dispatcher_;

scoped_refptr<WebRtcAudioDeviceImpl> audio_device_;