content/content_renderer.gypi - Issue 83023005: Add VideoTrackSink interface to content/public

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/content_renderer.gypi

Issue 83023005: Add VideoTrackSink interface to content/public (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge error Created 7 years 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: content/content_renderer.gypi

diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi

index 9c83c0e376e09f45c45f74fa340c7ab42fab1313..564317880e3e5eb1b4b6fd153879296e9000e1c1 100644

--- a/content/content_renderer.gypi

+++ b/content/content_renderer.gypi

@@ -589,6 +589,9 @@

'sources': [

'public/renderer/media_stream_audio_sink.h',

'public/renderer/media_stream_audio_sink.cc',

+ 'public/renderer/media_stream_sink.h',

+ 'public/renderer/media_stream_video_sink.cc',

+ 'public/renderer/media_stream_video_sink.h',

'public/renderer/webrtc_log_message_delegate.h',

'renderer/media/media_stream_audio_processor.cc',

'renderer/media/media_stream_audio_processor.h',

@@ -597,6 +600,8 @@

'renderer/media/media_stream_audio_sink_owner.cc',

'renderer/media/media_stream_audio_sink_owner.h',

'renderer/media/media_stream_audio_track_sink.h',

+ 'renderer/media/media_stream_video_track.cc',

+ 'renderer/media/media_stream_video_track.h',

'renderer/media/media_stream_center.cc',

'renderer/media/media_stream_dependency_factory.cc',

'renderer/media/media_stream_dispatcher.cc',

@@ -662,6 +667,8 @@

'renderer/media/webrtc_local_audio_track.h',

'renderer/media/webrtc_logging.cc',

'renderer/media/webrtc_logging.h',

+ 'renderer/media/webrtc/webrtc_video_sink_adapter.cc',

+ 'renderer/media/webrtc/webrtc_video_sink_adapter.h',

'renderer/p2p/host_address_request.cc',

'renderer/p2p/host_address_request.h',

'renderer/p2p/ipc_network_manager.cc',

« no previous file with comments | « no previous file | content/public/renderer/media_stream_sink.h » ('j') | no next file with comments »