Measure encoding time on encode callbacks.

webrtc/video/video_capture_input.h

Index: webrtc/video/video_capture_input.h
diff --git a/webrtc/video/video_capture_input.h b/webrtc/video/video_capture_input.h
index d44907cd0ee83270f15aed1ae3d18969f20854bb..6f543a23b6139930677f1571aa51e78c1007a074 100644
--- a/webrtc/video/video_capture_input.h
+++ b/webrtc/video/video_capture_input.h
@@ -31,12 +31,9 @@
 namespace webrtc {
 
 class Config;
-class CpuOveruseMetricsObserver;
-class CpuOveruseObserver;
 class CriticalSectionWrapper;
 class OveruseFrameDetector;
 class ProcessThread;
-class RegistrableCpuOveruseMetricsObserver;
 class SendStatisticsProxy;
 class VideoRenderer;
 
@@ -50,11 +47,10 @@ class VideoCaptureCallback {
 namespace internal {
 class VideoCaptureInput : public webrtc::VideoCaptureInput {
  public:
-  VideoCaptureInput(ProcessThread* module_process_thread,
-                    VideoCaptureCallback* frame_callback,
+  VideoCaptureInput(VideoCaptureCallback* frame_callback,
                     VideoRenderer* local_renderer,
                     SendStatisticsProxy* send_stats_proxy,
-                    CpuOveruseObserver* overuse_observer,
+                    OveruseFrameDetector* overuse_detector,
                     EncodingTimeObserver* encoding_time_observer);
   ~VideoCaptureInput();
 
@@ -66,7 +62,6 @@ class VideoCaptureInput : public webrtc::VideoCaptureInput {
   bool EncoderProcess();
 
   rtc::scoped_ptr<CriticalSectionWrapper> capture_cs_;
-  ProcessThread* const module_process_thread_;
 
   VideoCaptureCallback* const frame_callback_;
   VideoRenderer* const local_renderer_;
@@ -87,7 +82,7 @@ class VideoCaptureInput : public webrtc::VideoCaptureInput {
   // Delta used for translating between NTP and internal timestamps.
   const int64_t delta_ntp_internal_ms_;
 
-  rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_;
+  OveruseFrameDetector* const overuse_detector_;
   EncodingTimeObserver* const encoding_time_observer_;
 };