commit 9aed00209095e68cf5831a4bfa33178ad307ef61
author asapersson@webrtc.org <asapersson@webrtc.org> Thu Oct 16 06:57:12 2014
committer asapersson@webrtc.org <asapersson@webrtc.org> Thu Oct 16 06:57:12 2014
tree 8ca0ff9253f155b902cfaebf480a72ec6fe80344
parent d1ba6d9cbfc44618d2c553ff7851948c730ae37b

Add ability to include a larger time span (in addition to encode time) for measuring the processing time of a frame.
Controlled by setting enable_extended_processing_usage. Enabled by default.

R=mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/13289004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7460 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/video_engine/overuse_frame_detector.h

diff --git a/webrtc/video_engine/overuse_frame_detector.h b/webrtc/video_engine/overuse_frame_detector.h
index df3c1a0..421e9de 100644
--- a/webrtc/video_engine/overuse_frame_detector.h
+++ b/webrtc/video_engine/overuse_frame_detector.h
@@ -61,7 +61,7 @@
   void SetOptions(const CpuOveruseOptions& options);
 
   // Called for each captured frame.
-  void FrameCaptured(int width, int height);
+  void FrameCaptured(int width, int height, int64_t capture_time_ms);
 
   // Called when the processing of a captured frame is started.
   void FrameProcessingStarted();
@@ -69,14 +69,19 @@
   // Called for each encoded frame.
   void FrameEncoded(int encode_time_ms);
 
+  // Called for each sent frame.
+  void FrameSent(int64_t capture_time_ms);
+
   // Accessors.
 
   // Returns CpuOveruseMetrics where
   // capture_jitter_ms: The estimated jitter based on incoming captured frames.
   // avg_encode_time_ms: Running average of reported encode time
   //                     (FrameEncoded()). Only used for stats.
-  // encode_usage_percent: The average encode time divided by the average time
-  //                       difference between incoming captured frames.
+  // TODO(asapersson): Rename metric.
+  // encode_usage_percent: The average processing time of a frame on the
+  //                       send-side divided by the average time difference
+  //                       between incoming captured frames.
   // capture_queue_delay_ms_per_s: The current time delay between an incoming
   //                               captured frame (FrameCaptured()) until the
   //                               frame is being processed
@@ -87,7 +92,10 @@
   //                               Only used for stats.
   void GetCpuOveruseMetrics(CpuOveruseMetrics* metrics) const;
 
+  // Only public for testing.
   int CaptureQueueDelayMsPerS() const;
+  int LastProcessingTimeMs() const;
+  int FramesInQueue() const;
 
   // Implements Module.
   virtual int32_t TimeUntilNextProcess() OVERRIDE;
@@ -95,9 +103,12 @@
 
  private:
   class EncodeTimeAvg;
-  class EncodeTimeRsd;
-  class EncodeUsage;
+  class SendProcessingRsd;
+  class SendProcessingUsage;
   class CaptureQueueDelay;
+  class FrameQueue;
+
+  void AddProcessingTime(int elapsed_ms);
 
   bool IsOverusing();
   bool IsUnderusing(int64_t time_now);
@@ -135,8 +146,11 @@
 
   int64_t last_encode_sample_ms_;
   scoped_ptr<EncodeTimeAvg> encode_time_;
-  scoped_ptr<EncodeTimeRsd> encode_rsd_;
-  scoped_ptr<EncodeUsage> encode_usage_;
+
+  scoped_ptr<SendProcessingRsd> rsd_;
+  scoped_ptr<SendProcessingUsage> usage_;
+  scoped_ptr<FrameQueue> frame_queue_;
+  int64_t last_sample_time_ms_;
 
   scoped_ptr<CaptureQueueDelay> capture_queue_delay_;