OLD | NEW |
---|---|
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
46 // Creates an instance of VideoSource. | 46 // Creates an instance of VideoSource. |
47 // VideoSource take ownership of |capturer|. | 47 // VideoSource take ownership of |capturer|. |
48 // |constraints| can be NULL and in that case the camera is opened using a | 48 // |constraints| can be NULL and in that case the camera is opened using a |
49 // default resolution. | 49 // default resolution. |
50 static rtc::scoped_refptr<VideoSource> Create( | 50 static rtc::scoped_refptr<VideoSource> Create( |
51 cricket::ChannelManager* channel_manager, | 51 cricket::ChannelManager* channel_manager, |
52 cricket::VideoCapturer* capturer, | 52 cricket::VideoCapturer* capturer, |
53 const webrtc::MediaConstraintsInterface* constraints, | 53 const webrtc::MediaConstraintsInterface* constraints, |
54 bool remote); | 54 bool remote); |
55 | 55 |
56 // Note that the non-constraints version does not have the ability to | |
57 // select configuration based on width, height, aspect ratio or frame rate. | |
58 static rtc::scoped_refptr<VideoSource> Create( | |
perkj_webrtc
2016/02/23 11:40:18
Remove this method? Just use the above with constr
hta-webrtc
2016/02/23 14:30:34
Part of the video path - see previous comment abou
| |
59 cricket::ChannelManager* channel_manager, | |
60 cricket::VideoCapturer* capturer, | |
61 bool remote); | |
62 | |
56 SourceState state() const override { return state_; } | 63 SourceState state() const override { return state_; } |
57 bool remote() const override { return remote_; } | 64 bool remote() const override { return remote_; } |
58 | 65 |
59 virtual const cricket::VideoOptions* options() const { return &options_; } | 66 virtual const cricket::VideoOptions* options() const { return &options_; } |
60 | 67 |
61 virtual cricket::VideoCapturer* GetVideoCapturer() { | 68 virtual cricket::VideoCapturer* GetVideoCapturer() { |
62 return video_capturer_.get(); | 69 return video_capturer_.get(); |
63 } | 70 } |
64 | 71 |
65 void Stop() override; | 72 void Stop() override; |
(...skipping 24 matching lines...) Expand all Loading... | |
90 | 97 |
91 cricket::VideoFormat format_; | 98 cricket::VideoFormat format_; |
92 cricket::VideoOptions options_; | 99 cricket::VideoOptions options_; |
93 SourceState state_; | 100 SourceState state_; |
94 const bool remote_; | 101 const bool remote_; |
95 }; | 102 }; |
96 | 103 |
97 } // namespace webrtc | 104 } // namespace webrtc |
98 | 105 |
99 #endif // WEBRTC_API_VIDEOSOURCE_H_ | 106 #endif // WEBRTC_API_VIDEOSOURCE_H_ |
OLD | NEW |