| Index: webrtc/modules/audio_processing/test/process_test.cc
|
| diff --git a/webrtc/modules/audio_processing/test/process_test.cc b/webrtc/modules/audio_processing/test/process_test.cc
|
| index 185bc142d508a316a71a6155dfdf63f0371248cc..527e0a1e3e58cd5666375f67607577321e952395 100644
|
| --- a/webrtc/modules/audio_processing/test/process_test.cc
|
| +++ b/webrtc/modules/audio_processing/test/process_test.cc
|
| @@ -19,13 +19,13 @@
|
| #include <memory>
|
|
|
| #include "webrtc/base/format_macros.h"
|
| +#include "webrtc/base/timeutils.h"
|
| #include "webrtc/common.h"
|
| #include "webrtc/modules/audio_processing/include/audio_processing.h"
|
| #include "webrtc/modules/audio_processing/test/protobuf_utils.h"
|
| #include "webrtc/modules/audio_processing/test/test_utils.h"
|
| #include "webrtc/modules/include/module_common_types.h"
|
| #include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
|
| -#include "webrtc/system_wrappers/include/tick_util.h"
|
| #include "webrtc/test/testsupport/fileutils.h"
|
| #include "webrtc/test/testsupport/perf_test.h"
|
| #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
|
| @@ -562,7 +562,7 @@ void void_main(int argc, char* argv[]) {
|
| int reverse_count = 0;
|
| int primary_count = 0;
|
| int near_read_bytes = 0;
|
| - TickInterval acc_ticks;
|
| + int64_t acc_nanos = 0;
|
|
|
| AudioFrame far_frame;
|
| AudioFrame near_frame;
|
| @@ -573,8 +573,8 @@ void void_main(int argc, char* argv[]) {
|
| int8_t stream_has_voice = 0;
|
| float ns_speech_prob = 0.0f;
|
|
|
| - TickTime t0 = TickTime::Now();
|
| - TickTime t1 = t0;
|
| + int64_t t0 = rtc::TimeNanos();
|
| + int64_t t1 = t0;
|
| int64_t max_time_us = 0;
|
| int64_t max_time_reverse_us = 0;
|
| int64_t min_time_us = 1e6;
|
| @@ -676,7 +676,7 @@ void void_main(int argc, char* argv[]) {
|
| }
|
|
|
| if (perf_testing) {
|
| - t0 = TickTime::Now();
|
| + t0 = rtc::TimeNanos();
|
| }
|
|
|
| if (msg.has_data()) {
|
| @@ -692,14 +692,15 @@ void void_main(int argc, char* argv[]) {
|
| }
|
|
|
| if (perf_testing) {
|
| - t1 = TickTime::Now();
|
| - TickInterval tick_diff = t1 - t0;
|
| - acc_ticks += tick_diff;
|
| - if (tick_diff.Microseconds() > max_time_reverse_us) {
|
| - max_time_reverse_us = tick_diff.Microseconds();
|
| + t1 = rtc::TimeNanos();
|
| + int64_t diff_nanos = t1 - t0;
|
| + acc_nanos += diff_nanos;
|
| + int64_t diff_us = diff_nanos / rtc::kNumNanosecsPerMicrosec;
|
| + if (diff_us > max_time_reverse_us) {
|
| + max_time_reverse_us = diff_us;
|
| }
|
| - if (tick_diff.Microseconds() < min_time_reverse_us) {
|
| - min_time_reverse_us = tick_diff.Microseconds();
|
| + if (diff_us < min_time_reverse_us) {
|
| + min_time_reverse_us = diff_us;
|
| }
|
| }
|
|
|
| @@ -737,7 +738,7 @@ void void_main(int argc, char* argv[]) {
|
| }
|
|
|
| if (perf_testing) {
|
| - t0 = TickTime::Now();
|
| + t0 = rtc::TimeNanos();
|
| }
|
|
|
| ASSERT_EQ(apm->kNoError,
|
| @@ -795,14 +796,15 @@ void void_main(int argc, char* argv[]) {
|
| }
|
|
|
| if (perf_testing) {
|
| - t1 = TickTime::Now();
|
| - TickInterval tick_diff = t1 - t0;
|
| - acc_ticks += tick_diff;
|
| - if (tick_diff.Microseconds() > max_time_us) {
|
| - max_time_us = tick_diff.Microseconds();
|
| + t1 = rtc::TimeNanos();
|
| + int64_t diff_nanos = t1 - t0;
|
| + acc_nanos += diff_nanos;
|
| + int64_t diff_us = diff_nanos / rtc::kNumNanosecsPerMicrosec;
|
| + if (diff_us > max_time_us) {
|
| + max_time_us = diff_us;
|
| }
|
| - if (tick_diff.Microseconds() < min_time_us) {
|
| - min_time_us = tick_diff.Microseconds();
|
| + if (diff_us < min_time_us) {
|
| + min_time_us = diff_us;
|
| }
|
| }
|
|
|
| @@ -925,21 +927,22 @@ void void_main(int argc, char* argv[]) {
|
| }
|
|
|
| if (perf_testing) {
|
| - t0 = TickTime::Now();
|
| + t0 = rtc::TimeNanos();
|
| }
|
|
|
| ASSERT_EQ(apm->kNoError,
|
| apm->ProcessReverseStream(&far_frame));
|
|
|
| if (perf_testing) {
|
| - t1 = TickTime::Now();
|
| - TickInterval tick_diff = t1 - t0;
|
| - acc_ticks += tick_diff;
|
| - if (tick_diff.Microseconds() > max_time_reverse_us) {
|
| - max_time_reverse_us = tick_diff.Microseconds();
|
| + t1 = rtc::TimeNanos();
|
| + int64_t diff_nanos = t1 - t0;
|
| + acc_nanos += diff_nanos;
|
| + int64_t diff_us = diff_nanos / rtc::kNumNanosecsPerMicrosec;
|
| + if (diff_us > max_time_reverse_us) {
|
| + max_time_reverse_us = diff_us;
|
| }
|
| - if (tick_diff.Microseconds() < min_time_reverse_us) {
|
| - min_time_reverse_us = tick_diff.Microseconds();
|
| + if (diff_us < min_time_reverse_us) {
|
| + min_time_reverse_us = diff_us;
|
| }
|
| }
|
|
|
| @@ -982,7 +985,7 @@ void void_main(int argc, char* argv[]) {
|
| }
|
|
|
| if (perf_testing) {
|
| - t0 = TickTime::Now();
|
| + t0 = rtc::TimeNanos();
|
| }
|
|
|
| const int capture_level_in = capture_level;
|
| @@ -1030,14 +1033,15 @@ void void_main(int argc, char* argv[]) {
|
| }
|
|
|
| if (perf_testing) {
|
| - t1 = TickTime::Now();
|
| - TickInterval tick_diff = t1 - t0;
|
| - acc_ticks += tick_diff;
|
| - if (tick_diff.Microseconds() > max_time_us) {
|
| - max_time_us = tick_diff.Microseconds();
|
| + t1 = rtc::TimeNanos();
|
| + int64_t diff_nanos = t1 - t0;
|
| + acc_nanos += diff_nanos;
|
| + int64_t diff_us = diff_nanos / rtc::kNumNanosecsPerMicrosec;
|
| + if (diff_us > max_time_us) {
|
| + max_time_us = diff_us;
|
| }
|
| - if (tick_diff.Microseconds() < min_time_us) {
|
| - min_time_us = tick_diff.Microseconds();
|
| + if (diff_us < min_time_us) {
|
| + min_time_us = diff_us;
|
| }
|
| }
|
|
|
| @@ -1130,7 +1134,7 @@ void void_main(int argc, char* argv[]) {
|
|
|
| if (perf_testing) {
|
| if (primary_count > 0) {
|
| - int64_t exec_time = acc_ticks.Milliseconds();
|
| + int64_t exec_time = acc_nanos / rtc::kNumNanosecsPerMillisec;
|
| printf("\nTotal time: %.3f s, file time: %.2f s\n",
|
| exec_time * 0.001, primary_count * 0.01);
|
| printf("Time per frame: %.3f ms (average), %.3f ms (max),"
|
|
|