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

Unified Diff: media/filters/video_renderer_algorithm_unittest.cc

Issue 1124333012: Don't carry over frame overage unless frame is selected by cadence. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clarify. Cleanup test. Created 5 years, 7 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
« no previous file with comments | « media/filters/video_renderer_algorithm.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/video_renderer_algorithm_unittest.cc
diff --git a/media/filters/video_renderer_algorithm_unittest.cc b/media/filters/video_renderer_algorithm_unittest.cc
index 20ce6ef826d93bf91c0a7e6ec01443aa93179e27..1eb22820c5118476cf35a362f573bc936a90df7c 100644
--- a/media/filters/video_renderer_algorithm_unittest.cc
+++ b/media/filters/video_renderer_algorithm_unittest.cc
@@ -1166,4 +1166,51 @@ TEST_F(VideoRendererAlgorithmTest, EnqueueFrames) {
EXPECT_EQ(1u, frames_dropped);
}
+TEST_F(VideoRendererAlgorithmTest, CadenceForFutureFrames) {
+ TickGenerator tg(base::TimeTicks(), 50);
+ time_source_.StartTicking();
+
+ disable_cadence_hysteresis();
+
+ algorithm_.EnqueueFrame(CreateFrame(tg.interval(10)));
+ algorithm_.EnqueueFrame(CreateFrame(tg.interval(11)));
+ algorithm_.EnqueueFrame(CreateFrame(tg.interval(12)));
+ EXPECT_EQ(3u, frames_queued());
+
+ // Call Render() a few times to increment the render count.
+ for (int i = 0; i < 10; ++i) {
+ size_t frames_dropped = 0;
+ scoped_refptr<VideoFrame> rendered_frame =
+ RenderAndStep(&tg, &frames_dropped);
+ EXPECT_EQ(3u, frames_queued());
+ EXPECT_EQ(tg.interval(10), rendered_frame->timestamp());
+ ASSERT_TRUE(is_using_cadence());
+ }
+
+ // Add some noise to the tick generator so it our first frame
+ // doesn't line up evenly on a deadline.
+ tg.Reset(tg.current() + base::TimeDelta::FromMilliseconds(5));
+
+ // We're now at the first frame, cadence should be one, so
+ // it should only be displayed once.
+ size_t frames_dropped = 0;
+ scoped_refptr<VideoFrame> rendered_frame =
+ RenderAndStep(&tg, &frames_dropped);
+ EXPECT_EQ(3u, frames_queued());
+ EXPECT_EQ(tg.interval(10), rendered_frame->timestamp());
+ ASSERT_TRUE(is_using_cadence());
+
+ // Then the next frame should be displayed.
+ rendered_frame = RenderAndStep(&tg, &frames_dropped);
+ EXPECT_EQ(2u, frames_queued());
+ EXPECT_EQ(tg.interval(11), rendered_frame->timestamp());
+ ASSERT_TRUE(is_using_cadence());
+
+ // Finally the last frame.
+ rendered_frame = RenderAndStep(&tg, &frames_dropped);
+ EXPECT_EQ(1u, frames_queued());
+ EXPECT_EQ(tg.interval(12), rendered_frame->timestamp());
+ ASSERT_TRUE(is_using_cadence());
+}
+
} // namespace media
« no previous file with comments | « media/filters/video_renderer_algorithm.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698