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

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

Issue 1766653002: Replace SetCapturer and SetCaptureDevice by SetSource. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Also revert VideoTrack test changes. 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 | « no previous file | webrtc/api/mediastreamprovider.h » ('j') | webrtc/media/base/videocapturer.cc » ('J')
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
(...skipping 12 matching lines...) Expand all
23 #include "webrtc/base/basictypes.h" 23 #include "webrtc/base/basictypes.h"
24 #include "webrtc/base/refcount.h" 24 #include "webrtc/base/refcount.h"
25 #include "webrtc/base/scoped_ref_ptr.h" 25 #include "webrtc/base/scoped_ref_ptr.h"
26 #include "webrtc/media/base/mediachannel.h" 26 #include "webrtc/media/base/mediachannel.h"
27 #include "webrtc/media/base/videosinkinterface.h" 27 #include "webrtc/media/base/videosinkinterface.h"
28 #include "webrtc/media/base/videosourceinterface.h" 28 #include "webrtc/media/base/videosourceinterface.h"
29 29
30 namespace cricket { 30 namespace cricket {
31 31
32 class AudioRenderer; 32 class AudioRenderer;
33 class VideoCapturer;
34 class VideoRenderer; 33 class VideoRenderer;
35 class VideoFrame; 34 class VideoFrame;
36 35
37 } // namespace cricket 36 } // namespace cricket
38 37
39 namespace webrtc { 38 namespace webrtc {
40 39
41 // Generic observer interface. 40 // Generic observer interface.
42 class ObserverInterface { 41 class ObserverInterface {
43 public: 42 public:
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 : public MediaSourceInterface, 126 : public MediaSourceInterface,
128 public rtc::VideoSourceInterface<cricket::VideoFrame> { 127 public rtc::VideoSourceInterface<cricket::VideoFrame> {
129 public: 128 public:
130 // Get access to the source implementation of cricket::VideoCapturer. 129 // Get access to the source implementation of cricket::VideoCapturer.
131 // This can be used for receiving frames and state notifications. 130 // This can be used for receiving frames and state notifications.
132 // But it should not be used for starting or stopping capturing. 131 // But it should not be used for starting or stopping capturing.
133 // TODO(perkj): We are currently trying to replace all internal use of 132 // TODO(perkj): We are currently trying to replace all internal use of
134 // cricket::VideoCapturer with rtc::VideoSourceInterface. Once that 133 // cricket::VideoCapturer with rtc::VideoSourceInterface. Once that
135 // refactoring is done, 134 // refactoring is done,
136 // remove this method. 135 // remove this method.
137 virtual cricket::VideoCapturer* GetVideoCapturer() = 0; 136 virtual cricket::VideoCapturer* GetVideoCapturer() = 0;
perkj_webrtc 2016/03/22 08:56:36 Remove in this cl please! (if you can)
138 137
139 virtual void Stop() = 0; 138 virtual void Stop() = 0;
140 virtual void Restart() = 0; 139 virtual void Restart() = 0;
141 140
142 // Indicates that parameters suitable for screencasts should be automatically 141 // Indicates that parameters suitable for screencasts should be automatically
143 // applied to RtpSenders. 142 // applied to RtpSenders.
144 // TODO(perkj): Remove these once all known applications have moved to 143 // TODO(perkj): Remove these once all known applications have moved to
145 // explicitly setting suitable parameters for screencasts and dont' need this 144 // explicitly setting suitable parameters for screencasts and dont' need this
146 // implicit behavior. 145 // implicit behavior.
147 virtual bool is_screencast() const = 0; 146 virtual bool is_screencast() const = 0;
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 virtual bool RemoveTrack(AudioTrackInterface* track) = 0; 296 virtual bool RemoveTrack(AudioTrackInterface* track) = 0;
298 virtual bool RemoveTrack(VideoTrackInterface* track) = 0; 297 virtual bool RemoveTrack(VideoTrackInterface* track) = 0;
299 298
300 protected: 299 protected:
301 virtual ~MediaStreamInterface() {} 300 virtual ~MediaStreamInterface() {}
302 }; 301 };
303 302
304 } // namespace webrtc 303 } // namespace webrtc
305 304
306 #endif // WEBRTC_API_MEDIASTREAMINTERFACE_H_ 305 #endif // WEBRTC_API_MEDIASTREAMINTERFACE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/mediastreamprovider.h » ('j') | webrtc/media/base/videocapturer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698