zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete all use of tick_util.h.

Browse Source 
Depends on Chrome cl https://codereview.chromium.org/1888003002/, which was landed some time ago.

BUG=webrtc:5740
R=stefan@webrtc.org, tommi@webrtc.org

Review URL: https://codereview.webrtc.org/1888593004 .

Cr-Commit-Position: refs/heads/master@{#12674}
This commit is contained in:
Niels Möller
2016-05-10 16:31:47 +02:00
parent b031a2e862
commit d28db7fd65
68 changed files with 269 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/modules/video_processing/test/video_processing_unittest.cc
View File

@ -15,8 +15,8 @@
#include <memory>
#include <string>
#include "webrtc/base/timeutils.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/system_wrappers/include/tick_util.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
@ -144,11 +144,12 @@ TEST_F(VideoProcessingTest, Resampler) {
for (uint32_t run_idx = 0; run_idx < NumRuns; run_idx++) {
// Initiate test timer.
const TickTime time_start = TickTime::Now();
const int64_t time_start = rtc::TimeNanos();
// Init the sourceFrame with a timestamp.
video_frame_.set_render_time_ms(time_start.MillisecondTimestamp());
video_frame_.set_timestamp(time_start.MillisecondTimestamp() * 90);
int64_t time_start_ms = time_start / rtc::kNumNanosecsPerMillisec;
video_frame_.set_render_time_ms(time_start_ms);
video_frame_.set_timestamp(time_start_ms * 90);
// Test scaling to different sizes: source is of |width|/|height| = 352/288.
// Pure scaling:
@ -191,7 +192,8 @@ TEST_F(VideoProcessingTest, Resampler) {
TestSize(video_frame_, cropped_source_frame, 281, 175, 29.3, vp_);
// Stop timer.
const int64_t runtime = (TickTime::Now() - time_start).Microseconds();
const int64_t runtime =
(rtc::TimeNanos() - time_start) / rtc::kNumNanosecsPerMicrosec;
if (runtime < min_runtime || run_idx == 0) {
min_runtime = runtime;
}