| Index: webrtc/modules/video_processing/video_decimator.cc
|
| diff --git a/webrtc/modules/video_processing/video_decimator.cc b/webrtc/modules/video_processing/video_decimator.cc
|
| index 63e347b026e8af156355a424fde7decb7b1bc1ab..27f700b208bdc3a4bceead39e09f80611168cafa 100644
|
| --- a/webrtc/modules/video_processing/video_decimator.cc
|
| +++ b/webrtc/modules/video_processing/video_decimator.cc
|
| @@ -9,9 +9,9 @@
|
| */
|
|
|
| #include "webrtc/base/checks.h"
|
| +#include "webrtc/base/timeutils.h"
|
| #include "webrtc/modules/video_processing/include/video_processing.h"
|
| #include "webrtc/modules/video_processing/video_decimator.h"
|
| -#include "webrtc/system_wrappers/include/tick_util.h"
|
|
|
| #define VD_MIN(a, b) ((a) < (b)) ? (a) : (b)
|
|
|
| @@ -95,7 +95,7 @@ bool VPMVideoDecimator::DropFrame() {
|
| }
|
|
|
| uint32_t VPMVideoDecimator::GetDecimatedFrameRate() {
|
| - ProcessIncomingframe_rate(TickTime::MillisecondTimestamp());
|
| + ProcessIncomingframe_rate(rtc::Time64());
|
| if (!enable_temporal_decimation_) {
|
| return static_cast<uint32_t>(incoming_frame_rate_ + 0.5f);
|
| }
|
| @@ -104,12 +104,12 @@ uint32_t VPMVideoDecimator::GetDecimatedFrameRate() {
|
| }
|
|
|
| uint32_t VPMVideoDecimator::Inputframe_rate() {
|
| - ProcessIncomingframe_rate(TickTime::MillisecondTimestamp());
|
| + ProcessIncomingframe_rate(rtc::Time64());
|
| return static_cast<uint32_t>(incoming_frame_rate_ + 0.5f);
|
| }
|
|
|
| void VPMVideoDecimator::UpdateIncomingframe_rate() {
|
| - int64_t now = TickTime::MillisecondTimestamp();
|
| + int64_t now = rtc::Time64();
|
| if (incoming_frame_times_[0] == 0) {
|
| // First no shift.
|
| } else {
|
|
|