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 1c27cb0b7b8dc40915cc62d4e0624719ec690e8d..a8262b8d9d3ccb31c1613ead983f4d6f406857bd 100644
--- a/webrtc/video/video_capture_input.h
+++ b/webrtc/video/video_capture_input.h
@@ -30,11 +30,8 @@
 namespace webrtc {
 
 class Config;
-class CpuOveruseMetricsObserver;
-class CpuOveruseObserver;
 class OveruseFrameDetector;
 class ProcessThread;

[åsapersson, 2016/02/04 11:17:55]

can this be removed?

[pbos-webrtc, 2016/02/04 12:38:04]

Done.

-class RegistrableCpuOveruseMetricsObserver;
 class SendStatisticsProxy;
 class VideoRenderer;
 
@@ -48,12 +45,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,
-                    EncodingTimeObserver* encoding_time_observer);
+                    OveruseFrameDetector* overuse_detector);
   ~VideoCaptureInput();
 
   void IncomingCapturedFrame(const VideoFrame& video_frame) override;
@@ -64,7 +59,6 @@ class VideoCaptureInput : public webrtc::VideoCaptureInput {
   bool EncoderProcess();
 
   rtc::CriticalSection crit_;
-  ProcessThread* const module_process_thread_;
 
   VideoCaptureCallback* const frame_callback_;
   VideoRenderer* const local_renderer_;
@@ -81,8 +75,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_;
-  EncodingTimeObserver* const encoding_time_observer_;
+  OveruseFrameDetector* const overuse_detector_;
 };
 
 }  // namespace internal