Index: webrtc/video/vie_encoder.cc |
diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc |
index de3ab7117523f02f71dc0bcd8abe51d61cf0af12..3b4906e9edb72baccd8782a9b8f91f294b6bbed3 100644 |
--- a/webrtc/video/vie_encoder.cc |
+++ b/webrtc/video/vie_encoder.cc |
@@ -18,6 +18,7 @@ |
#include "webrtc/base/logging.h" |
#include "webrtc/base/trace_event.h" |
#include "webrtc/common_video/include/frame_callback.h" |
+#include "webrtc/base/timeutils.h" |
#include "webrtc/common_video/include/video_image.h" |
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" |
#include "webrtc/modules/pacing/paced_sender.h" |
@@ -27,7 +28,6 @@ |
#include "webrtc/modules/video_coding/include/video_coding_defines.h" |
#include "webrtc/system_wrappers/include/clock.h" |
#include "webrtc/system_wrappers/include/metrics.h" |
-#include "webrtc/system_wrappers/include/tick_util.h" |
#include "webrtc/video/overuse_frame_detector.h" |
#include "webrtc/video/payload_router.h" |
#include "webrtc/video/send_statistics_proxy.h" |
@@ -267,7 +267,7 @@ int ViEEncoder::GetPaddingNeededBps() const { |
// The amount of padding should decay to zero if no frames are being |
// captured/encoded unless a min-transmit bitrate is used. |
- int64_t now_ms = TickTime::MillisecondTimestamp(); |
+ int64_t now_ms = rtc::Time64(); |
if (now_ms - time_of_last_frame_activity_ms > kStopPaddingThresholdMs) |
pad_up_to_bitrate_bps = 0; |
@@ -321,7 +321,7 @@ void ViEEncoder::EncodeVideoFrame(const VideoFrame& video_frame) { |
VideoCodecType codec_type; |
{ |
rtc::CritScope lock(&data_cs_); |
- time_of_last_frame_activity_ms_ = TickTime::MillisecondTimestamp(); |
+ time_of_last_frame_activity_ms_ = rtc::Time64(); |
if (EncoderPaused()) { |
TraceFrameDropStart(); |
return; |
@@ -411,7 +411,7 @@ int32_t ViEEncoder::SendData(const uint8_t payload_type, |
{ |
rtc::CritScope lock(&data_cs_); |
- time_of_last_frame_activity_ms_ = TickTime::MillisecondTimestamp(); |
+ time_of_last_frame_activity_ms_ = rtc::Time64(); |
} |
if (stats_proxy_) |
@@ -482,7 +482,7 @@ void ViEEncoder::OnReceivedIntraFrameRequest(uint32_t ssrc) { |
for (size_t i = 0; i < ssrcs_.size(); ++i) { |
if (ssrcs_[i] != ssrc) |
continue; |
- int64_t now_ms = TickTime::MillisecondTimestamp(); |
+ int64_t now_ms = rtc::Time64(); |
{ |
rtc::CritScope lock(&data_cs_); |
if (time_last_intra_request_ms_[i] + kMinKeyFrameRequestIntervalMs > |