OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 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 #include "webrtc/api/video/video_frame.h" | 11 #include "webrtc/api/video/video_frame.h" |
12 | 12 |
13 #include "webrtc/base/checks.h" | 13 #include "webrtc/base/checks.h" |
14 #include "webrtc/base/timeutils.h" | 14 #include "webrtc/base/timeutils.h" |
15 | 15 |
16 namespace webrtc { | 16 namespace webrtc { |
17 | 17 |
18 VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer, | 18 VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer, |
19 webrtc::VideoRotation rotation, | 19 webrtc::VideoRotation rotation, |
| 20 webrtc::VideoContentType content_type, |
20 int64_t timestamp_us) | 21 int64_t timestamp_us) |
21 : video_frame_buffer_(buffer), | 22 : video_frame_buffer_(buffer), |
22 timestamp_rtp_(0), | 23 timestamp_rtp_(0), |
23 ntp_time_ms_(0), | 24 ntp_time_ms_(0), |
24 timestamp_us_(timestamp_us), | 25 timestamp_us_(timestamp_us), |
25 rotation_(rotation) {} | 26 rotation_(rotation), |
| 27 content_type_(content_type) {} |
26 | 28 |
27 VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer, | 29 VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer, |
28 uint32_t timestamp, | 30 uint32_t timestamp, |
29 int64_t render_time_ms, | 31 int64_t render_time_ms, |
30 VideoRotation rotation) | 32 VideoRotation rotation, |
| 33 VideoContentType content_type) |
31 : video_frame_buffer_(buffer), | 34 : video_frame_buffer_(buffer), |
32 timestamp_rtp_(timestamp), | 35 timestamp_rtp_(timestamp), |
33 ntp_time_ms_(0), | 36 ntp_time_ms_(0), |
34 timestamp_us_(render_time_ms * rtc::kNumMicrosecsPerMillisec), | 37 timestamp_us_(render_time_ms * rtc::kNumMicrosecsPerMillisec), |
35 rotation_(rotation) { | 38 rotation_(rotation), |
| 39 content_type_(content_type) { |
36 RTC_DCHECK(buffer); | 40 RTC_DCHECK(buffer); |
37 } | 41 } |
38 | 42 |
39 VideoFrame::~VideoFrame() = default; | 43 VideoFrame::~VideoFrame() = default; |
40 | 44 |
41 VideoFrame::VideoFrame(const VideoFrame&) = default; | 45 VideoFrame::VideoFrame(const VideoFrame&) = default; |
42 VideoFrame::VideoFrame(VideoFrame&&) = default; | 46 VideoFrame::VideoFrame(VideoFrame&&) = default; |
43 VideoFrame& VideoFrame::operator=(const VideoFrame&) = default; | 47 VideoFrame& VideoFrame::operator=(const VideoFrame&) = default; |
44 VideoFrame& VideoFrame::operator=(VideoFrame&&) = default; | 48 VideoFrame& VideoFrame::operator=(VideoFrame&&) = default; |
45 | 49 |
(...skipping 11 matching lines...) Expand all Loading... |
57 | 61 |
58 rtc::scoped_refptr<VideoFrameBuffer> VideoFrame::video_frame_buffer() const { | 62 rtc::scoped_refptr<VideoFrameBuffer> VideoFrame::video_frame_buffer() const { |
59 return video_frame_buffer_; | 63 return video_frame_buffer_; |
60 } | 64 } |
61 | 65 |
62 int64_t VideoFrame::render_time_ms() const { | 66 int64_t VideoFrame::render_time_ms() const { |
63 return timestamp_us() / rtc::kNumMicrosecsPerMillisec; | 67 return timestamp_us() / rtc::kNumMicrosecsPerMillisec; |
64 } | 68 } |
65 | 69 |
66 } // namespace webrtc | 70 } // namespace webrtc |
OLD | NEW |