content/renderer/media/webrtc/media_stream_video_webrtc_sink.h - Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545

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: content/renderer/media/webrtc/media_stream_video_webrtc_sink.h

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rolling to webrtc@11548 instead to pull in a fix Created 4 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 unified diff | Download patch

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

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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_TRACK_ADAPTER_H_	5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_TRACK_ADAPTER_H_

6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_TRACK_ADAPTER_H_	6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_TRACK_ADAPTER_H_

7	7

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "base/threading/thread_checker.h"	9 #include "base/threading/thread_checker.h"

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

11 #include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h"	11 #include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h"

12 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"	12 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"

13 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"	13 #include "third_party/webrtc/api/mediastreaminterface.h"

14 #include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"	14 #include "third_party/webrtc/api/videosourceinterface.h"

15	15

16 namespace content {	16 namespace content {

17	17

18 class MediaStreamVideoTrack;	18 class MediaStreamVideoTrack;

19 class PeerConnectionDependencyFactory;	19 class PeerConnectionDependencyFactory;

20	20

21 // MediaStreamVideoWebRtcSink is an adapter between a	21 // MediaStreamVideoWebRtcSink is an adapter between a

22 // content::MediaStreamVideoTrack object and a webrtc VideoTrack that is	22 // content::MediaStreamVideoTrack object and a webrtc VideoTrack that is

23 // currently sent on a PeerConnection.	23 // currently sent on a PeerConnection.

24 // The responsibility of the class is to create and own a representation of a	24 // The responsibility of the class is to create and own a representation of a

(...skipping 25 matching lines...) Expand all Loading...
50	50

51 class WebRtcVideoSourceAdapter;	51 class WebRtcVideoSourceAdapter;

52 scoped_refptr<WebRtcVideoSourceAdapter> source_adapter_;	52 scoped_refptr<WebRtcVideoSourceAdapter> source_adapter_;

53	53

54 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoWebRtcSink);	54 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoWebRtcSink);

55 };	55 };

56	56

57 } // namespace content	57 } // namespace content

58	58

59 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_TRACK_ADAPTER_H_	59 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_TRACK_ADAPTER_H_

OLD	NEW