remoting/protocol/webrtc_video_stream.cc - 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_stream.cc

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 #include "remoting/protocol/webrtc_video_stream.h"	5 #include "remoting/protocol/webrtc_video_stream.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "remoting/protocol/webrtc_video_capturer_adapter.h"	8 #include "remoting/protocol/webrtc_video_capturer_adapter.h"

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

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

11 #include "third_party/libjingle/source/talk/app/webrtc/test/fakeconstraints.h"	11 #include "third_party/webrtc/api/test/fakeconstraints.h"

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

13	13

14 namespace remoting {	14 namespace remoting {

15 namespace protocol {	15 namespace protocol {

16	16

17 const char kStreamLabel[] = "screen_stream";	17 const char kStreamLabel[] = "screen_stream";

18 const char kVideoLabel[] = "screen_video";	18 const char kVideoLabel[] = "screen_video";

19	19

20 WebrtcVideoStream::WebrtcVideoStream() {}	20 WebrtcVideoStream::WebrtcVideoStream() {}

21	21

22 WebrtcVideoStream::~WebrtcVideoStream() {	22 WebrtcVideoStream::~WebrtcVideoStream() {

(...skipping 61 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
84 NOTIMPLEMENTED();	84 NOTIMPLEMENTED();

85 }	85 }

86	86

87 void WebrtcVideoStream::SetSizeCallback(const SizeCallback& size_callback) {	87 void WebrtcVideoStream::SetSizeCallback(const SizeCallback& size_callback) {

88 if (capturer_adapter_)	88 if (capturer_adapter_)

89 capturer_adapter_->SetSizeCallback(size_callback);	89 capturer_adapter_->SetSizeCallback(size_callback);

90 }	90 }

91	91

92 } // namespace protocol	92 } // namespace protocol

93 } // namespace remoting	93 } // namespace remoting

OLD	NEW

« no previous file with comments | « remoting/protocol/webrtc_video_renderer_adapter.h ('k') | third_party/libjingle/BUILD.gn » ('j') | no next file with comments »