| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 int InsertFrame(std::unique_ptr<FrameObject> frame); | 50 int InsertFrame(std::unique_ptr<FrameObject> frame); |
| 51 | 51 |
| 52 // Get the next frame for decoding. Will return at latest after | 52 // Get the next frame for decoding. Will return at latest after |
| 53 // |max_wait_time_ms|. | 53 // |max_wait_time_ms|. |
| 54 // - If a frame is available within |max_wait_time_ms| it will return | 54 // - If a frame is available within |max_wait_time_ms| it will return |
| 55 // kFrameFound and set |frame_out| to the resulting frame. | 55 // kFrameFound and set |frame_out| to the resulting frame. |
| 56 // - If no frame is available after |max_wait_time_ms| it will return | 56 // - If no frame is available after |max_wait_time_ms| it will return |
| 57 // kTimeout. | 57 // kTimeout. |
| 58 // - If the FrameBuffer is stopped then it will return kStopped. | 58 // - If the FrameBuffer is stopped then it will return kStopped. |
| 59 ReturnReason NextFrame(int64_t max_wait_time_ms, | 59 ReturnReason NextFrame(int64_t max_wait_time_ms, |
| 60 std::unique_ptr<FrameObject>* frame_out, | 60 std::unique_ptr<FrameObject>* frame_out); |
| 61 bool keyframe_required = false); | |
| 62 | 61 |
| 63 // Tells the FrameBuffer which protection mode that is in use. Affects | 62 // Tells the FrameBuffer which protection mode that is in use. Affects |
| 64 // the frame timing. | 63 // the frame timing. |
| 65 // TODO(philipel): Remove this when new timing calculations has been | 64 // TODO(philipel): Remove this when new timing calculations has been |
| 66 // implemented. | 65 // implemented. |
| 67 void SetProtectionMode(VCMVideoProtection mode); | 66 void SetProtectionMode(VCMVideoProtection mode); |
| 68 | 67 |
| 69 // Start the frame buffer, has no effect if the frame buffer is started. | 68 // Start the frame buffer, has no effect if the frame buffer is started. |
| 70 // The frame buffer is started upon construction. | 69 // The frame buffer is started upon construction. |
| 71 void Start(); | 70 void Start(); |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 VCMReceiveStatisticsCallback* const stats_callback_; | 179 VCMReceiveStatisticsCallback* const stats_callback_; |
| 181 int64_t last_log_non_decoded_ms_ GUARDED_BY(crit_); | 180 int64_t last_log_non_decoded_ms_ GUARDED_BY(crit_); |
| 182 | 181 |
| 183 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FrameBuffer); | 182 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FrameBuffer); |
| 184 }; | 183 }; |
| 185 | 184 |
| 186 } // namespace video_coding | 185 } // namespace video_coding |
| 187 } // namespace webrtc | 186 } // namespace webrtc |
| 188 | 187 |
| 189 #endif // WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER2_H_ | 188 #endif // WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER2_H_ |
| OLD | NEW |