Index: webrtc/modules/video_render/test/testAPI/testAPI.cc |
diff --git a/webrtc/modules/video_render/test/testAPI/testAPI.cc b/webrtc/modules/video_render/test/testAPI/testAPI.cc |
index cea2f6b56fe0bc33d99c812ea5543621218ee45b..b99d041701481cf0a786e362c02237fb28978287 100644 |
--- a/webrtc/modules/video_render/test/testAPI/testAPI.cc |
+++ b/webrtc/modules/video_render/test/testAPI/testAPI.cc |
@@ -31,13 +31,13 @@ |
#endif |
+#include "webrtc/base/timeutils.h" |
#include "webrtc/common_types.h" |
#include "webrtc/modules/include/module_common_types.h" |
#include "webrtc/modules/utility/include/process_thread.h" |
#include "webrtc/modules/video_render/video_render.h" |
#include "webrtc/modules/video_render/video_render_defines.h" |
#include "webrtc/system_wrappers/include/sleep.h" |
-#include "webrtc/system_wrappers/include/tick_util.h" |
#include "webrtc/system_wrappers/include/trace.h" |
using namespace webrtc; |
@@ -313,7 +313,7 @@ int TestSingleStream(VideoRender* renderModule) { |
for (int i=0; i<TEST_FRAME_NUM; i++) { |
GetTestVideoFrame(&videoFrame0, TEST_STREAM0_START_COLOR); |
// Render this frame with the specified delay |
- videoFrame0.set_render_time_ms(TickTime::MillisecondTimestamp() |
+ videoFrame0.set_render_time_ms(rtc::Time64() |
+ renderDelayMs); |
renderCallback0->RenderFrame(streamId0, videoFrame0); |
SleepMs(1000/TEST_FRAME_RATE); |
@@ -387,7 +387,7 @@ int TestBitmapText(VideoRender* renderModule) { |
for (int i=0; i<TEST_FRAME_NUM; i++) { |
GetTestVideoFrame(&videoFrame0, TEST_STREAM0_START_COLOR); |
// Render this frame with the specified delay |
- videoFrame0.set_render_time_ms(TickTime::MillisecondTimestamp() + |
+ videoFrame0.set_render_time_ms(rtc::Time64() + |
renderDelayMs); |
renderCallback0->RenderFrame(streamId0, videoFrame0); |
SleepMs(1000/TEST_FRAME_RATE); |
@@ -472,22 +472,22 @@ int TestMultipleStreams(VideoRender* renderModule) { |
for (int i=0; i<TEST_FRAME_NUM; i++) { |
GetTestVideoFrame(&videoFrame0, TEST_STREAM0_START_COLOR); |
- videoFrame0.set_render_time_ms(TickTime::MillisecondTimestamp() + |
+ videoFrame0.set_render_time_ms(rtc::Time64() + |
renderDelayMs); |
renderCallback0->RenderFrame(streamId0, videoFrame0); |
GetTestVideoFrame(&videoFrame1, TEST_STREAM1_START_COLOR); |
- videoFrame1.set_render_time_ms(TickTime::MillisecondTimestamp() + |
+ videoFrame1.set_render_time_ms(rtc::Time64() + |
renderDelayMs); |
renderCallback1->RenderFrame(streamId1, videoFrame1); |
GetTestVideoFrame(&videoFrame2, TEST_STREAM2_START_COLOR); |
- videoFrame2.set_render_time_ms(TickTime::MillisecondTimestamp() + |
+ videoFrame2.set_render_time_ms(rtc::Time64() + |
renderDelayMs); |
renderCallback2->RenderFrame(streamId2, videoFrame2); |
GetTestVideoFrame(&videoFrame3, TEST_STREAM3_START_COLOR); |
- videoFrame3.set_render_time_ms(TickTime::MillisecondTimestamp() + |
+ videoFrame3.set_render_time_ms(rtc::Time64() + |
renderDelayMs); |
renderCallback3->RenderFrame(streamId3, videoFrame3); |
@@ -545,7 +545,7 @@ int TestExternalRender(VideoRender* renderModule) { |
const uint32_t renderDelayMs = 500; |
int frameCount = TEST_FRAME_NUM; |
for (int i=0; i<frameCount; i++) { |
- videoFrame0.set_render_time_ms(TickTime::MillisecondTimestamp() + |
+ videoFrame0.set_render_time_ms(rtc::Time64() + |
renderDelayMs); |
renderCallback0->RenderFrame(streamId0, videoFrame0); |
SleepMs(33); |