OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 30 matching lines...) Expand all Loading... | |
41 ~VideoFrame(); | 41 ~VideoFrame(); |
42 | 42 |
43 // Support move and copy. | 43 // Support move and copy. |
44 VideoFrame(const VideoFrame&); | 44 VideoFrame(const VideoFrame&); |
45 VideoFrame(VideoFrame&&); | 45 VideoFrame(VideoFrame&&); |
46 VideoFrame& operator=(const VideoFrame&); | 46 VideoFrame& operator=(const VideoFrame&); |
47 VideoFrame& operator=(VideoFrame&&); | 47 VideoFrame& operator=(VideoFrame&&); |
48 | 48 |
49 // Get frame width. | 49 // Get frame width. |
50 int width() const; | 50 int width() const; |
51 | |
52 // Get frame height. | 51 // Get frame height. |
53 int height() const; | 52 int height() const; |
53 // Get frame size in pixels. | |
perkj_webrtc
2017/01/17 08:53:10
nit: empty line
kthelgason
2017/01/18 09:16:16
Acknowledged.
| |
54 int size() const; | |
54 | 55 |
55 // System monotonic clock, same timebase as rtc::TimeMicros(). | 56 // System monotonic clock, same timebase as rtc::TimeMicros(). |
56 int64_t timestamp_us() const { return timestamp_us_; } | 57 int64_t timestamp_us() const { return timestamp_us_; } |
57 void set_timestamp_us(int64_t timestamp_us) { timestamp_us_ = timestamp_us; } | 58 void set_timestamp_us(int64_t timestamp_us) { timestamp_us_ = timestamp_us; } |
58 | 59 |
59 // TODO(nisse): After the cricket::VideoFrame and webrtc::VideoFrame | 60 // TODO(nisse): After the cricket::VideoFrame and webrtc::VideoFrame |
60 // merge, timestamps other than timestamp_us will likely be | 61 // merge, timestamps other than timestamp_us will likely be |
61 // deprecated. | 62 // deprecated. |
62 | 63 |
63 // Set frame timestamp (90kHz). | 64 // Set frame timestamp (90kHz). |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
110 rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_; | 111 rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_; |
111 uint32_t timestamp_rtp_; | 112 uint32_t timestamp_rtp_; |
112 int64_t ntp_time_ms_; | 113 int64_t ntp_time_ms_; |
113 int64_t timestamp_us_; | 114 int64_t timestamp_us_; |
114 VideoRotation rotation_; | 115 VideoRotation rotation_; |
115 }; | 116 }; |
116 | 117 |
117 } // namespace webrtc | 118 } // namespace webrtc |
118 | 119 |
119 #endif // WEBRTC_API_VIDEO_VIDEO_FRAME_H_ | 120 #endif // WEBRTC_API_VIDEO_VIDEO_FRAME_H_ |
OLD | NEW |