Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1029)

Unified Diff: media/capture/video_capture_oracle_unittest.cc

Issue 1199593005: Automatic resolution throttling for screen capture pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@resolution_chooser_ITEM13
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/capture/video_capture_oracle_unittest.cc
diff --git a/media/capture/video_capture_oracle_unittest.cc b/media/capture/video_capture_oracle_unittest.cc
index f343c879085034b945619e7cdb11bb63eef4efeb..f7ae61d97c853016fa557cd585ed94af30ecaceb 100644
--- a/media/capture/video_capture_oracle_unittest.cc
+++ b/media/capture/video_capture_oracle_unittest.cc
@@ -25,7 +25,9 @@ TEST(VideoCaptureOracleTest, EnforcesEventTimeMonotonicity) {
const gfx::Rect damage_rect(0, 0, 1280, 720);
const base::TimeDelta event_increment = min_capture_period * 2;
- VideoCaptureOracle oracle(min_capture_period);
+ VideoCaptureOracle oracle(min_capture_period,
+ gfx::Size(1280, 720),
+ media::RESOLUTION_POLICY_FIXED_RESOLUTION);
base::TimeTicks t = InitialTestTimeTicks();
for (int i = 0; i < 10; ++i) {
@@ -61,7 +63,9 @@ TEST(VideoCaptureOracleTest, EnforcesFramesDeliveredInOrder) {
const gfx::Rect damage_rect(0, 0, 1280, 720);
const base::TimeDelta event_increment = min_capture_period * 2;
- VideoCaptureOracle oracle(min_capture_period);
+ VideoCaptureOracle oracle(min_capture_period,
+ gfx::Size(1280, 720),
+ media::RESOLUTION_POLICY_FIXED_RESOLUTION);
// Most basic scenario: Frames delivered one at a time, with no additional
// captures in-between deliveries.
@@ -73,7 +77,7 @@ TEST(VideoCaptureOracleTest, EnforcesFramesDeliveredInOrder) {
ASSERT_TRUE(oracle.ObserveEventAndDecideCapture(
VideoCaptureOracle::kCompositorUpdate,
damage_rect, t));
- last_frame_number = oracle.RecordCapture();
+ last_frame_number = oracle.RecordCapture(0.0);
ASSERT_TRUE(oracle.CompleteCapture(last_frame_number, true, &ignored));
}
@@ -85,7 +89,7 @@ TEST(VideoCaptureOracleTest, EnforcesFramesDeliveredInOrder) {
ASSERT_TRUE(oracle.ObserveEventAndDecideCapture(
VideoCaptureOracle::kCompositorUpdate,
damage_rect, t));
- last_frame_number = oracle.RecordCapture();
+ last_frame_number = oracle.RecordCapture(0.0);
}
for (int j = num_in_flight - 1; j >= 0; --j) {
ASSERT_TRUE(
@@ -102,7 +106,7 @@ TEST(VideoCaptureOracleTest, EnforcesFramesDeliveredInOrder) {
ASSERT_TRUE(oracle.ObserveEventAndDecideCapture(
VideoCaptureOracle::kCompositorUpdate,
damage_rect, t));
- last_frame_number = oracle.RecordCapture();
+ last_frame_number = oracle.RecordCapture(0.0);
}
ASSERT_TRUE(oracle.CompleteCapture(last_frame_number, true, &ignored));
for (int j = 1; j < num_in_flight; ++j) {
@@ -120,7 +124,7 @@ TEST(VideoCaptureOracleTest, EnforcesFramesDeliveredInOrder) {
ASSERT_TRUE(oracle.ObserveEventAndDecideCapture(
VideoCaptureOracle::kCompositorUpdate,
damage_rect, t));
- last_frame_number = oracle.RecordCapture();
+ last_frame_number = oracle.RecordCapture(0.0);
}
// Report the last frame as an out of order failure.
ASSERT_FALSE(oracle.CompleteCapture(last_frame_number, false, &ignored));
@@ -140,7 +144,9 @@ TEST(VideoCaptureOracleTest, TransitionsSmoothlyBetweenSamplers) {
const gfx::Rect animation_damage_rect(0, 0, 1280, 720);
const base::TimeDelta event_increment = min_capture_period * 2;
- VideoCaptureOracle oracle(min_capture_period);
+ VideoCaptureOracle oracle(min_capture_period,
+ gfx::Size(1280, 720),
+ media::RESOLUTION_POLICY_FIXED_RESOLUTION);
// Run sequences of animation events and non-animation events through the
// oracle. As the oracle transitions between each sampler, make sure the
@@ -173,7 +179,7 @@ TEST(VideoCaptureOracleTest, TransitionsSmoothlyBetweenSamplers) {
}
ASSERT_LT(base::TimeDelta(), oracle.estimated_frame_duration());
- const int frame_number = oracle.RecordCapture();
+ const int frame_number = oracle.RecordCapture(0.0);
base::TimeTicks frame_timestamp;
ASSERT_TRUE(oracle.CompleteCapture(frame_number, true, &frame_timestamp));
@@ -203,7 +209,9 @@ TEST(VideoCaptureOracleTest, SamplesOnlyOneOverdueFrameAtATime) {
const base::TimeDelta timer_interval = base::TimeDelta::FromMilliseconds(
VideoCaptureOracle::kMinTimerPollPeriodMillis);
- VideoCaptureOracle oracle(min_capture_period);
+ VideoCaptureOracle oracle(min_capture_period,
+ gfx::Size(1280, 720),
+ media::RESOLUTION_POLICY_FIXED_RESOLUTION);
// Have the oracle observe some compositor events. Simulate that each capture
// completes successfully.
@@ -215,7 +223,7 @@ TEST(VideoCaptureOracleTest, SamplesOnlyOneOverdueFrameAtATime) {
if (oracle.ObserveEventAndDecideCapture(
VideoCaptureOracle::kCompositorUpdate, gfx::Rect(), t)) {
ASSERT_TRUE(
- oracle.CompleteCapture(oracle.RecordCapture(), true, &ignored));
+ oracle.CompleteCapture(oracle.RecordCapture(0.0), true, &ignored));
did_complete_a_capture = true;
}
}
@@ -231,7 +239,7 @@ TEST(VideoCaptureOracleTest, SamplesOnlyOneOverdueFrameAtATime) {
break;
}
}
- int frame_number = oracle.RecordCapture();
+ int frame_number = oracle.RecordCapture(0.0);
// Stop providing the compositor events and start providing timer polling
// events. No overdue samplings should be recommended because of the
@@ -252,7 +260,7 @@ TEST(VideoCaptureOracleTest, SamplesOnlyOneOverdueFrameAtATime) {
if (oracle.ObserveEventAndDecideCapture(
VideoCaptureOracle::kTimerPoll, gfx::Rect(), t)) {
ASSERT_TRUE(
- oracle.CompleteCapture(oracle.RecordCapture(), true, &ignored));
+ oracle.CompleteCapture(oracle.RecordCapture(0.0), true, &ignored));
did_complete_a_capture = true;
}
}
@@ -267,7 +275,7 @@ TEST(VideoCaptureOracleTest, SamplesOnlyOneOverdueFrameAtATime) {
break;
}
}
- frame_number = oracle.RecordCapture();
+ frame_number = oracle.RecordCapture(0.0);
// Confirm that the oracle does not recommend sampling until the outstanding
// timer-based capture completes.
« media/capture/video_capture_oracle.cc ('K') | « media/capture/video_capture_oracle.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698