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

Unified Diff: media/filters/video_renderer_base_unittest.cc

Issue 9155003: Fix media timeline so that thumb never exceeds buffered data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 11 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
« media/base/pipeline_unittest.cc ('K') | « media/filters/video_renderer_base.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_base_unittest.cc
diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc
index 88a1b1a8551b3dcc0d50504fc51337a5b551e07f..f7ca89ad618d831d7b32cf693370f87076b69169 100644
--- a/media/filters/video_renderer_base_unittest.cc
+++ b/media/filters/video_renderer_base_unittest.cc
@@ -75,6 +75,7 @@ class VideoRendererBaseTest : public ::testing::Test {
}
MOCK_METHOD0(PaintCBWasCalled, void());
+ MOCK_METHOD1(VideoTimeCBWasCalled, void(base::TimeDelta));
MOCK_CONST_METHOD1(SetOpaqueCBWasCalled, void(bool));
@@ -103,7 +104,8 @@ class VideoRendererBaseTest : public ::testing::Test {
// Initialize, we shouldn't have any reads.
renderer_->Initialize(decoder_,
- NewExpectedClosure(), NewStatisticsCallback());
+ NewExpectedClosure(), NewStatisticsCallback(),
+ NewVideoTimeCallback());
// Now seek to trigger prerolling.
Seek(0);
@@ -247,6 +249,11 @@ class VideoRendererBaseTest : public ::testing::Test {
base::Unretained(&stats_callback_object_));
}
+ VideoRenderer::VideoTimeCB NewVideoTimeCallback() {
+ return base::Bind(&VideoRendererBaseTest::VideoTimeCBWasCalled,
+ base::Unretained(this));
+ }
+
// Fixture members.
scoped_refptr<VideoRendererBase> renderer_;
scoped_refptr<MockVideoDecoder> decoder_;
« media/base/pipeline_unittest.cc ('K') | « media/filters/video_renderer_base.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698