Delete all use of tick_util.h.

webrtc/modules/video_capture/video_capture_impl.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_IMPL_H_
 #define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_IMPL_H_
 
 /*
  * video_capture_impl.h
  */
 
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/common_video/rotation.h"
 #include "webrtc/modules/video_capture/video_capture.h"
 #include "webrtc/modules/video_capture/video_capture_config.h"
-#include "webrtc/system_wrappers/include/tick_util.h"
 #include "webrtc/video_frame.h"
 
 namespace webrtc
 {
 class CriticalSectionWrapper;
 
 namespace videocapturemodule {
 // Class definitions
 class VideoCaptureImpl: public VideoCaptureModule, public VideoCaptureExternal
 {
@@ skipping 75 matching lines @@
     virtual ~VideoCaptureImpl();
     int32_t DeliverCapturedFrame(VideoFrame& captureFrame);
 
     int32_t _id; // Module ID
     char* _deviceUniqueId; // current Device unique name;
     CriticalSectionWrapper& _apiCs;
     int32_t _captureDelay; // Current capture delay. May be changed of platform dependent parts.
     VideoCaptureCapability _requestedCapability; // Should be set by platform dependent code in StartCapture.
 private:
     void UpdateFrameCount();
-    uint32_t CalculateFrameRate(const TickTime& now);
+    uint32_t CalculateFrameRate(int64_t now_ns);
 
     CriticalSectionWrapper& _callBackCs;
 
-    TickTime _lastProcessTime; // last time the module process function was called.
-    TickTime _lastFrameRateCallbackTime; // last time the frame rate callback function was called.
+    int64_t _lastProcessTime; // last time the module process function was called.

[stefan-webrtc, 2016/04/19 09:19:12]

Add units to these now that they aren't ticks.

[nisse-webrtc, 2016/04/19 12:19:25]

Adding "Nanos" to _lastProcessTime, _lastFrameRateCallbackTime, and
_incomingFrameTimes.

+    int64_t _lastFrameRateCallbackTime; // last time the frame rate callback function was called.
     bool _frameRateCallBack; // true if EnableFrameRateCallback
     bool _noPictureAlarmCallBack; //true if EnableNoPictureAlarm
     VideoCaptureAlarm _captureAlarm; // current value of the noPictureAlarm
 
     int32_t _setCaptureDelay; // The currently used capture delay
     VideoCaptureDataCallback* _dataCallBack;
     VideoCaptureFeedBack* _captureCallBack;
 
-    TickTime _lastProcessFrameCount;
-    TickTime _incomingFrameTimes[kFrameRateCountHistorySize];// timestamp for local captured frames
+    int64_t _lastProcessFrameCount;

[stefan-webrtc, 2016/04/19 09:19:12]

...Count is a weird name for a time

[nisse-webrtc, 2016/04/19 12:19:25]

Renaming, to the somewhat awkward _lastProcessFrameTimeNanos.

+    int64_t _incomingFrameTimes[kFrameRateCountHistorySize];// timestamp for local captured frames

[stefan-webrtc, 2016/04/19 09:19:12]

unit

     VideoRotation _rotateFrame;  // Set if the frame should be rotated by the
                                  // capture module.
 
     VideoFrame _captureFrame;
 
     // Indicate whether rotation should be applied before delivered externally.
     bool apply_rotation_;
 };
 }  // namespace videocapturemodule
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_IMPL_H_