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 #ifndef WEBRTC_COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_ | 11 #ifndef WEBRTC_COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_ |
12 #define WEBRTC_COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_ | 12 #define WEBRTC_COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_ |
13 | 13 |
14 #include <stdint.h> | 14 #include <stdint.h> |
15 | 15 |
16 #include <list> | 16 #include <list> |
17 | 17 |
18 #include "webrtc/api/video/video_frame.h" | 18 #include "webrtc/api/video/video_frame.h" |
19 #include "webrtc/base/optional.h" | 19 #include "webrtc/base/optional.h" |
20 | 20 |
21 namespace webrtc { | 21 namespace webrtc { |
22 | 22 |
23 // Class definitions | 23 // Class definitions |
24 class VideoRenderFrames { | 24 class VideoRenderFrames { |
25 public: | 25 public: |
26 explicit VideoRenderFrames(uint32_t render_delay_ms); | 26 explicit VideoRenderFrames(uint32_t render_delay_ms); |
27 VideoRenderFrames(const VideoRenderFrames&) = delete; | 27 VideoRenderFrames(const VideoRenderFrames&) = delete; |
28 | 28 |
29 // Add a frame to the render queue | 29 // Add a frame to the render queue |
30 int32_t AddFrame(const VideoFrame& new_frame); | 30 int32_t AddFrame(VideoFrame&& new_frame); |
31 | 31 |
32 // Get a frame for rendering, or false if it's not time to render. | 32 // Get a frame for rendering, or false if it's not time to render. |
33 rtc::Optional<VideoFrame> FrameToRender(); | 33 rtc::Optional<VideoFrame> FrameToRender(); |
34 | 34 |
35 // Returns the number of ms to next frame to render | 35 // Returns the number of ms to next frame to render |
36 uint32_t TimeToNextFrameRelease(); | 36 uint32_t TimeToNextFrameRelease(); |
37 | 37 |
| 38 bool HasPendingFrames() const; |
| 39 |
38 private: | 40 private: |
39 // 10 seconds for 30 fps. | |
40 enum { KMaxNumberOfFrames = 300 }; | |
41 // Don't render frames with timestamp older than 500ms from now. | |
42 enum { KOldRenderTimestampMS = 500 }; | |
43 // Don't render frames with timestamp more than 10s into the future. | |
44 enum { KFutureRenderTimestampMS = 10000 }; | |
45 | |
46 // Sorted list with framed to be rendered, oldest first. | 41 // Sorted list with framed to be rendered, oldest first. |
47 std::list<VideoFrame> incoming_frames_; | 42 std::list<VideoFrame> incoming_frames_; |
48 | 43 |
49 // Estimated delay from a frame is released until it's rendered. | 44 // Estimated delay from a frame is released until it's rendered. |
50 const uint32_t render_delay_ms_; | 45 const uint32_t render_delay_ms_; |
| 46 |
| 47 int64_t last_render_time_ms_ = 0; |
51 }; | 48 }; |
52 | 49 |
53 } // namespace webrtc | 50 } // namespace webrtc |
54 | 51 |
55 #endif // WEBRTC_COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_ | 52 #endif // WEBRTC_COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_ |
OLD | NEW |