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

Side by Side Diff: webrtc/media/base/videocapturer.h

Issue 2411953002: Reland of Make cricket::VideoFrame inherit webrtc::VideoFrame. (Closed)
Patch Set: Fix for windows build. Created 4 years, 2 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/media/base/videobroadcaster_unittest.cc ('k') | webrtc/media/base/videoframe.h » ('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 (c) 2010 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2010 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 24 matching lines...) Expand all
35 // Current state of the capturer. 35 // Current state of the capturer.
36 enum CaptureState { 36 enum CaptureState {
37 CS_STOPPED, // The capturer has been stopped or hasn't started yet. 37 CS_STOPPED, // The capturer has been stopped or hasn't started yet.
38 CS_STARTING, // The capturer is in the process of starting. Note, it may 38 CS_STARTING, // The capturer is in the process of starting. Note, it may
39 // still fail to start. 39 // still fail to start.
40 CS_RUNNING, // The capturer has been started successfully and is now 40 CS_RUNNING, // The capturer has been started successfully and is now
41 // capturing. 41 // capturing.
42 CS_FAILED, // The capturer failed to start. 42 CS_FAILED, // The capturer failed to start.
43 }; 43 };
44 44
45 class VideoFrame;
46
47 // VideoCapturer is an abstract class that defines the interfaces for video 45 // VideoCapturer is an abstract class that defines the interfaces for video
48 // capturing. The subclasses implement the video capturer for various types of 46 // capturing. The subclasses implement the video capturer for various types of
49 // capturers and various platforms. 47 // capturers and various platforms.
50 // 48 //
51 // The captured frames may need to be adapted (for example, cropping). 49 // The captured frames may need to be adapted (for example, cropping).
52 // Video adaptation is built into and enabled by default. After a frame has 50 // Video adaptation is built into and enabled by default. After a frame has
53 // been captured from the device, it is sent to the video adapter, then out to 51 // been captured from the device, it is sent to the video adapter, then out to
54 // the sinks. 52 // the sinks.
55 // 53 //
56 // Programming model: 54 // Programming model:
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 bool apply_rotation_; 286 bool apply_rotation_;
289 287
290 // State for the timestamp translation. 288 // State for the timestamp translation.
291 rtc::TimestampAligner timestamp_aligner_; 289 rtc::TimestampAligner timestamp_aligner_;
292 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer); 290 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer);
293 }; 291 };
294 292
295 } // namespace cricket 293 } // namespace cricket
296 294
297 #endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_ 295 #endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/videobroadcaster_unittest.cc ('k') | webrtc/media/base/videoframe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698