Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Side by Side Diff: webrtc/api/videosourceproxy.h

Issue 1758223002: Change webrtc::VideoSourceInterface to inherit rtc::VideoSourceInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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 | « webrtc/api/videosourceinterface.h ('k') | webrtc/api/videotrack.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_API_VIDEOSOURCEPROXY_H_ 11 #ifndef WEBRTC_API_VIDEOSOURCEPROXY_H_
12 #define WEBRTC_API_VIDEOSOURCEPROXY_H_ 12 #define WEBRTC_API_VIDEOSOURCEPROXY_H_
13 13
14 #include "webrtc/api/proxy.h" 14 #include "webrtc/api/proxy.h"
15 #include "webrtc/api/videosourceinterface.h" 15 #include "webrtc/api/videosourceinterface.h"
16 16
17 namespace webrtc { 17 namespace webrtc {
18 18
19 // VideoSourceProxy makes sure the real VideoSourceInterface implementation is 19 // VideoSourceProxy makes sure the real VideoSourceInterface implementation is
20 // destroyed on the signaling thread and marshals all method calls to the 20 // destroyed on the signaling thread and marshals all method calls to the
21 // signaling thread. 21 // signaling thread.
22 BEGIN_PROXY_MAP(VideoSource) 22 BEGIN_PROXY_MAP(VideoSource)
23 PROXY_CONSTMETHOD0(SourceState, state) 23 PROXY_CONSTMETHOD0(SourceState, state)
24 PROXY_CONSTMETHOD0(bool, remote) 24 PROXY_CONSTMETHOD0(bool, remote)
25 PROXY_METHOD0(cricket::VideoCapturer*, GetVideoCapturer) 25 PROXY_METHOD0(cricket::VideoCapturer*, GetVideoCapturer)
26 PROXY_METHOD0(void, Stop) 26 PROXY_METHOD0(void, Stop)
27 PROXY_METHOD0(void, Restart) 27 PROXY_METHOD0(void, Restart)
28 PROXY_METHOD1(void, AddSink, rtc::VideoSinkInterface<cricket::VideoFrame>*) 28 PROXY_METHOD2(void, AddOrUpdateSink,
29 rtc::VideoSinkInterface<cricket::VideoFrame>*,
30 const rtc::VideoSinkWants&)
29 PROXY_METHOD1(void, RemoveSink, rtc::VideoSinkInterface<cricket::VideoFrame>*) 31 PROXY_METHOD1(void, RemoveSink, rtc::VideoSinkInterface<cricket::VideoFrame>*)
30 PROXY_CONSTMETHOD0(const cricket::VideoOptions*, options) 32 PROXY_CONSTMETHOD0(const cricket::VideoOptions*, options)
31 PROXY_METHOD1(void, RegisterObserver, ObserverInterface*) 33 PROXY_METHOD1(void, RegisterObserver, ObserverInterface*)
32 PROXY_METHOD1(void, UnregisterObserver, ObserverInterface*) 34 PROXY_METHOD1(void, UnregisterObserver, ObserverInterface*)
33 END_PROXY() 35 END_PROXY()
34 36
35 } // namespace webrtc 37 } // namespace webrtc
36 38
37 #endif // WEBRTC_API_VIDEOSOURCEPROXY_H_ 39 #endif // WEBRTC_API_VIDEOSOURCEPROXY_H_
OLDNEW
« no previous file with comments | « webrtc/api/videosourceinterface.h ('k') | webrtc/api/videotrack.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698