Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / video_engine / overuse_frame_detector.h

diff --git a/src/third_party/webrtc/video_engine/overuse_frame_detector.h b/src/third_party/webrtc/video_engine/overuse_frame_detector.h
index 7cbb21c..c9f691c 100644 (file)
--- a/src/third_party/webrtc/video_engine/overuse_frame_detector.h
+++ b/src/third_party/webrtc/video_engine/overuse_frame_detector.h
@@ -14,6 +14,7 @@
 #include "webrtc/modules/interface/module.h"
 #include "webrtc/system_wrappers/interface/constructor_magic.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/test/testsupport/gtest_prod_util.h"
 
 namespace webrtc {
 
@@ -27,8 +28,8 @@ class VCMExpFilter;
 const float kOveruseStdDevMs = 15.0f;
 const float kNormalUseStdDevMs = 7.0f;
 #elif WEBRTC_MAC
-const float kOveruseStdDevMs = 22.0f;
-const float kNormalUseStdDevMs = 12.0f;
+const float kOveruseStdDevMs = 24.0f;
+const float kNormalUseStdDevMs = 14.0f;
 #else
 const float kOveruseStdDevMs = 17.0f;
 const float kNormalUseStdDevMs = 10.0f;
@@ -104,6 +105,19 @@ class OveruseFrameDetector : public Module {
   virtual int32_t Process() OVERRIDE;
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(OveruseFrameDetectorTest, TriggerOveruse);
+  FRIEND_TEST_ALL_PREFIXES(OveruseFrameDetectorTest, OveruseAndRecover);
+  FRIEND_TEST_ALL_PREFIXES(OveruseFrameDetectorTest, DoubleOveruseAndRecover);
+  FRIEND_TEST_ALL_PREFIXES(
+      OveruseFrameDetectorTest, TriggerNormalUsageWithMinProcessCount);
+  FRIEND_TEST_ALL_PREFIXES(
+      OveruseFrameDetectorTest, ConstantOveruseGivesNoNormalUsage);
+  FRIEND_TEST_ALL_PREFIXES(OveruseFrameDetectorTest, LastCaptureJitter);
+
+  void set_min_process_count_before_reporting(int64_t count) {
+    min_process_count_before_reporting_ = count;
+  }
+
   class EncodeTimeAvg;
   class EncodeUsage;
   class CaptureQueueDelay;
@@ -111,6 +125,8 @@ class OveruseFrameDetector : public Module {
   bool IsOverusing();
   bool IsUnderusing(int64_t time_now);
 
+  bool DetectFrameTimeout(int64_t now) const;
+
   // Protecting all members.
   scoped_ptr<CriticalSectionWrapper> crit_;
 
@@ -118,11 +134,14 @@ class OveruseFrameDetector : public Module {
   const float normaluse_stddev_ms_;
   const float overuse_stddev_ms_;
 
+  int64_t min_process_count_before_reporting_;
+
   // Observer getting overuse reports.
   CpuOveruseObserver* observer_;
 
   Clock* clock_;
   int64_t next_process_time_;
+  int64_t num_process_times_;
 
   Statistics capture_deltas_;
   int64_t last_capture_time_;