remoting/protocol/webrtc_video_renderer_adapter.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: remoting/protocol/webrtc_video_renderer_adapter.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

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

6 #define REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_	6 #define REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_

7	7

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

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

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

11	11

12 namespace base {	12 namespace base {

13 class SingleThreadTaskRunner;	13 class SingleThreadTaskRunner;

14 } // namespace base	14 } // namespace base

15	15

16 namespace webrtc {	16 namespace webrtc {

17 class DesktopFrame;	17 class DesktopFrame;

18 } // namespace webrtc	18 } // namespace webrtc

19	19

20 namespace remoting {	20 namespace remoting {

(...skipping 23 matching lines...) Expand all Loading...
44	44

45 base::WeakPtrFactory<WebrtcVideoRendererAdapter> weak_factory_;	45 base::WeakPtrFactory<WebrtcVideoRendererAdapter> weak_factory_;

46	46

47 DISALLOW_COPY_AND_ASSIGN(WebrtcVideoRendererAdapter);	47 DISALLOW_COPY_AND_ASSIGN(WebrtcVideoRendererAdapter);

48 };	48 };

49	49

50 } // namespace remoting	50 } // namespace remoting

51 } // namespace protocol	51 } // namespace protocol

52	52

53 #endif // REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_	53 #endif // REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_

OLD	NEW

« no previous file with comments | « remoting/protocol/webrtc_transport.cc ('k') | remoting/protocol/webrtc_video_stream.cc » ('j') | no next file with comments »