Fix Bug: Video with Variable Frame Rate plays at incorrect speed.

media/filters/video_cadence_estimator_unittest.cc

Index: media/filters/video_cadence_estimator_unittest.cc
diff --git a/media/filters/video_cadence_estimator_unittest.cc b/media/filters/video_cadence_estimator_unittest.cc
index a8a4b5c15cc54efff947930f4a14b5f09f40a9a3..c99a1df182595fb93b6909925a311c19a6c5782a 100644
--- a/media/filters/video_cadence_estimator_unittest.cc
+++ b/media/filters/video_cadence_estimator_unittest.cc
@@ -54,7 +54,8 @@ static void VerifyCadenceVectorWithCustomDrift(
 
   estimator->Reset();
   const bool cadence_changed = estimator->UpdateCadenceEstimate(
-      Interval(render_hertz), Interval(frame_hertz), acceptable_drift);
+      Interval(render_hertz), Interval(frame_hertz), base::TimeDelta(),
+      acceptable_drift);
   EXPECT_EQ(cadence_changed, estimator->has_cadence());
   EXPECT_EQ(expected_cadence_vector.empty(), !estimator->has_cadence());
 
@@ -169,15 +170,15 @@ TEST(VideoCadenceEstimatorTest, CadenceVariesWithAcceptableDrift) {
   const base::TimeDelta frame_interval = Interval(120);
 
   base::TimeDelta acceptable_drift = frame_interval / 2;
-  EXPECT_FALSE(estimator.UpdateCadenceEstimate(render_interval, frame_interval,
-                                               acceptable_drift));
+  EXPECT_FALSE(estimator.UpdateCadenceEstimate(
+      render_interval, frame_interval, base::TimeDelta(), acceptable_drift));
   EXPECT_FALSE(estimator.has_cadence());
 
   // Increasing the acceptable drift should be result in more permissive
   // detection of cadence.
   acceptable_drift = render_interval;
-  EXPECT_TRUE(estimator.UpdateCadenceEstimate(render_interval, frame_interval,
-                                              acceptable_drift));
+  EXPECT_TRUE(estimator.UpdateCadenceEstimate(
+      render_interval, frame_interval, base::TimeDelta(), acceptable_drift));
   EXPECT_TRUE(estimator.has_cadence());
   EXPECT_EQ("[1:0]", estimator.GetCadenceForTesting());
 }
@@ -191,8 +192,8 @@ TEST(VideoCadenceEstimatorTest, CadenceVariesWithAcceptableGlitchTime) {
   const base::TimeDelta frame_interval = Interval(120);
   const base::TimeDelta acceptable_drift = frame_interval / 2;
 
-  EXPECT_FALSE(estimator->UpdateCadenceEstimate(render_interval, frame_interval,
-                                                acceptable_drift));
+  EXPECT_FALSE(estimator->UpdateCadenceEstimate(
+      render_interval, frame_interval, base::TimeDelta(), acceptable_drift));
   EXPECT_FALSE(estimator->has_cadence());
 
   // Decreasing the acceptable glitch time should be result in more permissive
@@ -200,8 +201,8 @@ TEST(VideoCadenceEstimatorTest, CadenceVariesWithAcceptableGlitchTime) {
   estimator.reset(new VideoCadenceEstimator(base::TimeDelta::FromSeconds(
       kMinimumAcceptableTimeBetweenGlitchesSecs / 2)));
   estimator->set_cadence_hysteresis_threshold_for_testing(base::TimeDelta());
-  EXPECT_TRUE(estimator->UpdateCadenceEstimate(render_interval, frame_interval,
-                                               acceptable_drift));
+  EXPECT_TRUE(estimator->UpdateCadenceEstimate(
+      render_interval, frame_interval, base::TimeDelta(), acceptable_drift));
   EXPECT_TRUE(estimator->has_cadence());
   EXPECT_EQ("[1:0]", estimator->GetCadenceForTesting());
 }
@@ -216,33 +217,36 @@ TEST(VideoCadenceEstimatorTest, CadenceHystersisPreventsOscillation) {
   estimator->set_cadence_hysteresis_threshold_for_testing(render_interval * 2);
 
   // Cadence hysteresis should prevent the cadence from taking effect yet.
-  EXPECT_FALSE(estimator->UpdateCadenceEstimate(render_interval, frame_interval,
-                                                acceptable_drift));
+  EXPECT_FALSE(estimator->UpdateCadenceEstimate(
+      render_interval, frame_interval, base::TimeDelta(), acceptable_drift));
   EXPECT_FALSE(estimator->has_cadence());
 
   // A second call should exceed cadence hysteresis and take into effect.
-  EXPECT_TRUE(estimator->UpdateCadenceEstimate(render_interval, frame_interval,
-                                               acceptable_drift));
+  EXPECT_TRUE(estimator->UpdateCadenceEstimate(
+      render_interval, frame_interval, base::TimeDelta(), acceptable_drift));
   EXPECT_TRUE(estimator->has_cadence());
 
   // One bad interval shouldn't cause cadence to drop
-  EXPECT_FALSE(estimator->UpdateCadenceEstimate(
-      render_interval, frame_interval * 0.75, acceptable_drift));
+  EXPECT_FALSE(
+      estimator->UpdateCadenceEstimate(render_interval, frame_interval * 0.75,
+                                       base::TimeDelta(), acceptable_drift));
   EXPECT_TRUE(estimator->has_cadence());
 
   // Resumption of cadence should clear bad interval count.
-  EXPECT_FALSE(estimator->UpdateCadenceEstimate(render_interval, frame_interval,
-                                                acceptable_drift));
+  EXPECT_FALSE(estimator->UpdateCadenceEstimate(
+      render_interval, frame_interval, base::TimeDelta(), acceptable_drift));
   EXPECT_TRUE(estimator->has_cadence());
 
   // So one more bad interval shouldn't cause cadence to drop
-  EXPECT_FALSE(estimator->UpdateCadenceEstimate(
-      render_interval, frame_interval * 0.75, acceptable_drift));
+  EXPECT_FALSE(
+      estimator->UpdateCadenceEstimate(render_interval, frame_interval * 0.75,
+                                       base::TimeDelta(), acceptable_drift));
   EXPECT_TRUE(estimator->has_cadence());
 
   // Two bad intervals should.
-  EXPECT_TRUE(estimator->UpdateCadenceEstimate(
-      render_interval, frame_interval * 0.75, acceptable_drift));
+  EXPECT_TRUE(
+      estimator->UpdateCadenceEstimate(render_interval, frame_interval * 0.75,
+                                       base::TimeDelta(), acceptable_drift));
   EXPECT_FALSE(estimator->has_cadence());
 }