trunk/src/content/renderer/media/webrtc/webrtc_video_sink_adapter.h - Issue 231963002: Revert 262050 "Implement a source for remote video tracks."

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: trunk/src/content/renderer/media/webrtc/webrtc_video_sink_adapter.h

Issue 231963002: Revert 262050 "Implement a source for remote video tracks." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « trunk/src/content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc ('k') | trunk/src/content/renderer/media/webrtc/webrtc_video_sink_adapter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_SINK_ADAPTER_H_	5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_SINK_ADAPTER_H_

6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_SINK_ADAPTER_H_	6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_SINK_ADAPTER_H_

7	7

8 #include "base/memory/weak_ptr.h"	8 #include "base/memory/weak_ptr.h"

9 #include "content/common/content_export.h"	9 #include "content/common/content_export.h"

10 #include "content/public/renderer/media_stream_video_sink.h"	10 #include "content/public/renderer/media_stream_video_sink.h"

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51 scoped_refptr<webrtc::VideoTrackInterface> video_track_;	51 scoped_refptr<webrtc::VideoTrackInterface> video_track_;

52 webrtc::MediaStreamTrackInterface::TrackState state_;	52 webrtc::MediaStreamTrackInterface::TrackState state_;

53 bool track_enabled_;	53 bool track_enabled_;

54	54

55 DISALLOW_COPY_AND_ASSIGN(WebRtcVideoSinkAdapter);	55 DISALLOW_COPY_AND_ASSIGN(WebRtcVideoSinkAdapter);

56 };	56 };

57	57

58 } // namespace content	58 } // namespace content

59	59

60 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_SINK_ADAPTER_H_	60 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_SINK_ADAPTER_H_

OLD	NEW