| OLD | NEW |
| 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/media/capture/animated_content_sampler.h" | 5 #include "content/browser/media/capture/animated_content_sampler.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 714 } else { | 714 } else { |
| 715 EXPECT_GE(stray_count_remaining, display_counts[repeats]); | 715 EXPECT_GE(stray_count_remaining, display_counts[repeats]); |
| 716 stray_count_remaining -= display_counts[repeats]; | 716 stray_count_remaining -= display_counts[repeats]; |
| 717 } | 717 } |
| 718 } | 718 } |
| 719 } | 719 } |
| 720 | 720 |
| 721 // Tests that frame timestamps are "lightly pushed" back towards the original | 721 // Tests that frame timestamps are "lightly pushed" back towards the original |
| 722 // presentation event times, which tells us the AnimatedContentSampler can | 722 // presentation event times, which tells us the AnimatedContentSampler can |
| 723 // account for sources of timestamp drift and correct the drift. | 723 // account for sources of timestamp drift and correct the drift. |
| 724 // flaky: http://crbug.com/487491 |
| 724 TEST_P(AnimatedContentSamplerParameterizedTest, | 725 TEST_P(AnimatedContentSamplerParameterizedTest, |
| 725 FrameTimestampsConvergeTowardsEventTimes) { | 726 DISABLED_FrameTimestampsConvergeTowardsEventTimes) { |
| 726 const int max_drift_increment_millis = 3; | 727 const int max_drift_increment_millis = 3; |
| 727 | 728 |
| 728 // Generate a full minute of events. | 729 // Generate a full minute of events. |
| 729 const base::TimeTicks begin = InitialTestTimeTicks(); | 730 const base::TimeTicks begin = InitialTestTimeTicks(); |
| 730 std::vector<Event> events = | 731 std::vector<Event> events = |
| 731 GenerateEventSequence(begin, | 732 GenerateEventSequence(begin, |
| 732 begin + base::TimeDelta::FromMinutes(1), | 733 begin + base::TimeDelta::FromMinutes(1), |
| 733 true, | 734 true, |
| 734 false, | 735 false, |
| 735 nullptr); | 736 nullptr); |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 809 Scenario(60, 30, 23), | 810 Scenario(60, 30, 23), |
| 810 Scenario(60, 30, 26), | 811 Scenario(60, 30, 26), |
| 811 Scenario(60, 30, 27), | 812 Scenario(60, 30, 27), |
| 812 Scenario(60, 30, 28), | 813 Scenario(60, 30, 28), |
| 813 Scenario(60, 30, 29), | 814 Scenario(60, 30, 29), |
| 814 Scenario(60, 30, 31), | 815 Scenario(60, 30, 31), |
| 815 Scenario(60, 30, 32), | 816 Scenario(60, 30, 32), |
| 816 Scenario(60, 30, 33))); | 817 Scenario(60, 30, 33))); |
| 817 | 818 |
| 818 } // namespace content | 819 } // namespace content |
| OLD | NEW |