| 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 |
| 11 #ifndef WEBRTC_API_VIDEO_VIDEO_FRAME_H_ | 11 #ifndef WEBRTC_API_VIDEO_VIDEO_FRAME_H_ |
| 12 #define WEBRTC_API_VIDEO_VIDEO_FRAME_H_ | 12 #define WEBRTC_API_VIDEO_VIDEO_FRAME_H_ |
| 13 | 13 |
| 14 #include <stdint.h> | 14 #include <stdint.h> |
| 15 | 15 |
| 16 #include "webrtc/api/video/video_rotation.h" | 16 #include "webrtc/api/video/video_rotation.h" |
| 17 #include "webrtc/api/video/video_frame_buffer.h" | 17 #include "webrtc/api/video/video_frame_buffer.h" |
| 18 | 18 |
| 19 // TODO(nisse): Transition hack, some downstream applications expect |
| 20 // that including this file also defines base/timeutils.h constants. |
| 21 // Delete after applications are fixed to include the right headers. |
| 22 #include "webrtc/base/timeutils.h" |
| 23 |
| 19 namespace webrtc { | 24 namespace webrtc { |
| 20 | 25 |
| 21 class VideoFrame { | 26 class VideoFrame { |
| 22 public: | 27 public: |
| 23 // TODO(nisse): This constructor is consistent with the now deleted | 28 // TODO(nisse): This constructor is consistent with the now deleted |
| 24 // cricket::WebRtcVideoFrame. We should consider whether or not we | 29 // cricket::WebRtcVideoFrame. We should consider whether or not we |
| 25 // want to stick to this style and deprecate the other constructor. | 30 // want to stick to this style and deprecate the other constructor. |
| 26 VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer, | 31 VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer, |
| 27 webrtc::VideoRotation rotation, | 32 webrtc::VideoRotation rotation, |
| 28 int64_t timestamp_us); | 33 int64_t timestamp_us); |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_; | 111 rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_; |
| 107 uint32_t timestamp_rtp_; | 112 uint32_t timestamp_rtp_; |
| 108 int64_t ntp_time_ms_; | 113 int64_t ntp_time_ms_; |
| 109 int64_t timestamp_us_; | 114 int64_t timestamp_us_; |
| 110 VideoRotation rotation_; | 115 VideoRotation rotation_; |
| 111 }; | 116 }; |
| 112 | 117 |
| 113 } // namespace webrtc | 118 } // namespace webrtc |
| 114 | 119 |
| 115 #endif // WEBRTC_API_VIDEO_VIDEO_FRAME_H_ | 120 #endif // WEBRTC_API_VIDEO_VIDEO_FRAME_H_ |
| OLD | NEW |