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

Unified Diff: media/filters/audio_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
Index: media/filters/audio_renderer_base_unittest.cc
diff --git a/media/filters/audio_renderer_base_unittest.cc b/media/filters/audio_renderer_base_unittest.cc
index 93fe785d16873fd5a87cf90f7c750ddbe5282860..341a0976aee1058331222e7be083575403abdf45 100644
--- a/media/filters/audio_renderer_base_unittest.cc
+++ b/media/filters/audio_renderer_base_unittest.cc
@@ -88,11 +88,22 @@ class AudioRendererBaseTest : public ::testing::Test {
base::Unretained(this));
}
+ void OnAudioTimeCallback(
+ base::TimeDelta current_time, base::TimeDelta max_time) {
+ CHECK(current_time <= max_time);
+ }
+
+ AudioRenderer::AudioTimeCB NewAudioTimeClosure() {
+ return base::Bind(&AudioRendererBaseTest::OnAudioTimeCallback,
+ base::Unretained(this));
+ }
+
void Initialize() {
EXPECT_CALL(*renderer_, OnInitialize(_, _, _))
.WillOnce(Return(true));
renderer_->Initialize(
- decoder_, NewExpectedClosure(), NewUnderflowClosure());
+ decoder_, NewExpectedClosure(), NewUnderflowClosure(),
+ NewAudioTimeClosure());
}
void Preroll() {
@@ -195,7 +206,8 @@ TEST_F(AudioRendererBaseTest, Initialize_Failed) {
EXPECT_CALL(*renderer_, OnInitialize(_, _, _))
.WillOnce(Return(false));
EXPECT_CALL(host_, SetError(PIPELINE_ERROR_INITIALIZATION_FAILED));
- renderer_->Initialize(decoder_, NewExpectedClosure(), NewUnderflowClosure());
+ renderer_->Initialize(decoder_, NewExpectedClosure(), NewUnderflowClosure(),
+ NewAudioTimeClosure());
// We should have no reads.
EXPECT_TRUE(read_cb_.is_null());
@@ -204,7 +216,8 @@ TEST_F(AudioRendererBaseTest, Initialize_Failed) {
TEST_F(AudioRendererBaseTest, Initialize_Successful) {
EXPECT_CALL(*renderer_, OnInitialize(_, _, _))
.WillOnce(Return(true));
- renderer_->Initialize(decoder_, NewExpectedClosure(), NewUnderflowClosure());
+ renderer_->Initialize(decoder_, NewExpectedClosure(), NewUnderflowClosure(),
+ NewAudioTimeClosure());
// We should have no reads.
EXPECT_TRUE(read_cb_.is_null());

Powered by Google App Engine
This is Rietveld 408576698