Adjust VideoCaptureOracle wrt. out of order captures.

content/browser/media/capture/video_capture_oracle_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/capture/video_capture_oracle.h"
 
 #include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
@@ skipping 34 matching lines @@
 
   t = furthest_event_time;
   for (int i = 0; i < 10; ++i) {
     t += event_increment;
     ASSERT_TRUE(oracle.ObserveEventAndDecideCapture(
         VideoCaptureOracle::kCompositorUpdate,
         damage_rect, t));
   }
 }
 
-// Tests that VideoCaptureOracle is enforcing the requirement that captured
-// frames are delivered in order.  Otherwise, downstream consumers could be
-// tripped-up by out-of-order frames or frame timestamps.
+// Tests that VideoCaptureOracle is enforcing the requirement that
+// successfully captured frames are delivered in order.  Otherwise, downstream
+// consumers could be tripped-up by out-of-order frames or frame timestamps.
 TEST(VideoCaptureOracleTest, EnforcesFramesDeliveredInOrder) {
   const base::TimeDelta min_capture_period =
       base::TimeDelta::FromSeconds(1) / 30;
   const gfx::Rect damage_rect(0, 0, 1280, 720);
   const base::TimeDelta event_increment = min_capture_period * 2;
 
   VideoCaptureOracle oracle(min_capture_period);
 
   // Most basic scenario: Frames delivered one at a time, with no additional
   // captures in-between deliveries.
@@ skipping 18 matching lines @@
           VideoCaptureOracle::kCompositorUpdate,
           damage_rect, t));
       last_frame_number = oracle.RecordCapture();
     }
     for (int j = num_in_flight - 1; j >= 0; --j) {
       ASSERT_TRUE(
           oracle.CompleteCapture(last_frame_number - j, true, &ignored));
     }
   }
 
-  // Pipelined scenario with out-of-order delivery attempts rejected.
+  // Pipelined scenario with successful out-of-order delivery attempts
+  // rejected.
   for (int i = 0; i < 50; ++i) {
     const int num_in_flight = 1 + i % 3;
     for (int j = 0; j < num_in_flight; ++j) {
       t += event_increment;
       ASSERT_TRUE(oracle.ObserveEventAndDecideCapture(
           VideoCaptureOracle::kCompositorUpdate,
           damage_rect, t));
       last_frame_number = oracle.RecordCapture();
     }
     ASSERT_TRUE(oracle.CompleteCapture(last_frame_number, true, &ignored));
     for (int j = 1; j < num_in_flight; ++j) {
       ASSERT_FALSE(
           oracle.CompleteCapture(last_frame_number - j, true, &ignored));
     }
   }
+
+  // Pipelined scenario with successful delivery attempts accepted after an
+  // unsuccessful out of order delivery attempt.
+  for (int i = 0; i < 50; ++i) {
+    const int num_in_flight = 1 + i % 3;
+    for (int j = 0; j < num_in_flight; ++j) {
+      t += event_increment;
+      ASSERT_TRUE(oracle.ObserveEventAndDecideCapture(
+          VideoCaptureOracle::kCompositorUpdate,
+          damage_rect, t));
+      last_frame_number = oracle.RecordCapture();
+    }
+    // Report the last frame as an out of order failure.
+    ASSERT_FALSE(oracle.CompleteCapture(last_frame_number, false, &ignored));
+    for (int j = 1; j < num_in_flight - 1; ++j) {
+      ASSERT_TRUE(
+          oracle.CompleteCapture(last_frame_number - j, true, &ignored));
+    }
+
+  }
 }
 
 // Tests that VideoCaptureOracle transitions between using its two samplers in a
 // way that does not introduce severe jank, pauses, etc.
 TEST(VideoCaptureOracleTest, TransitionsSmoothlyBetweenSamplers) {
   const base::TimeDelta min_capture_period =
       base::TimeDelta::FromSeconds(1) / 30;
   const gfx::Rect animation_damage_rect(0, 0, 1280, 720);
   const base::TimeDelta event_increment = min_capture_period * 2;
 
@@ skipping 138 matching lines @@
     ASSERT_GT(10, i) << "BUG: Seems like it'll never happen!";
     t += timer_interval;
     if (oracle.ObserveEventAndDecideCapture(
             VideoCaptureOracle::kTimerPoll, gfx::Rect(), t)) {
       break;
     }
   }
 }
 
 }  // namespace content