Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: webrtc/voice_engine/monitor_module.cc

Issue 1888593004: Delete all use of tick_util.h. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/video/vie_sync_module.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/system_wrappers/include/tick_util.h" 11 #include "webrtc/base/timeutils.h"
12 #include "webrtc/voice_engine/monitor_module.h" 12 #include "webrtc/voice_engine/monitor_module.h"
13 13
14 namespace webrtc { 14 namespace webrtc {
15 15
16 namespace voe { 16 namespace voe {
17 17
18 MonitorModule::MonitorModule() : 18 MonitorModule::MonitorModule() :
19 _observerPtr(NULL), 19 _observerPtr(NULL),
20 _lastProcessTime(TickTime::MillisecondTimestamp()) 20 _lastProcessTime(rtc::TimeMillis())
21 { 21 {
22 } 22 }
23 23
24 MonitorModule::~MonitorModule() 24 MonitorModule::~MonitorModule()
25 { 25 {
26 } 26 }
27 27
28 int32_t 28 int32_t
29 MonitorModule::RegisterObserver(MonitorObserver& observer) 29 MonitorModule::RegisterObserver(MonitorObserver& observer)
30 { 30 {
(...skipping 14 matching lines...) Expand all
45 { 45 {
46 return 0; 46 return 0;
47 } 47 }
48 _observerPtr = NULL; 48 _observerPtr = NULL;
49 return 0; 49 return 0;
50 } 50 }
51 51
52 int64_t 52 int64_t
53 MonitorModule::TimeUntilNextProcess() 53 MonitorModule::TimeUntilNextProcess()
54 { 54 {
55 int64_t now = TickTime::MillisecondTimestamp(); 55 int64_t now = rtc::TimeMillis();
56 const int64_t kAverageProcessUpdateTimeMs = 1000; 56 const int64_t kAverageProcessUpdateTimeMs = 1000;
57 return kAverageProcessUpdateTimeMs - (now - _lastProcessTime); 57 return kAverageProcessUpdateTimeMs - (now - _lastProcessTime);
58 } 58 }
59 59
60 void 60 void
61 MonitorModule::Process() 61 MonitorModule::Process()
62 { 62 {
63 _lastProcessTime = TickTime::MillisecondTimestamp(); 63 _lastProcessTime = rtc::TimeMillis();
64 rtc::CritScope lock(&_callbackCritSect); 64 rtc::CritScope lock(&_callbackCritSect);
65 if (_observerPtr) 65 if (_observerPtr)
66 { 66 {
67 _observerPtr->OnPeriodicProcess(); 67 _observerPtr->OnPeriodicProcess();
68 } 68 }
69 } 69 }
70 70
71 } // namespace voe 71 } // namespace voe
72 72
73 } // namespace webrtc 73 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/vie_sync_module.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698