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

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: Rebase ToT, again 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
« no previous file with comments | « media/filters/audio_renderer_base.cc ('k') | media/filters/video_renderer_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c08a31420ac304196fbaddf8409008255bda8e39..4ada3e4a8607fa1fbafc7c3da38a03fd7b09ab21 100644
--- a/media/filters/audio_renderer_base_unittest.cc
+++ b/media/filters/audio_renderer_base_unittest.cc
@@ -91,11 +91,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_, NewExpectedStatusCB(PIPELINE_OK), NewUnderflowClosure());
+ decoder_, NewExpectedStatusCB(PIPELINE_OK), NewUnderflowClosure(),
+ NewAudioTimeClosure());
}
void Preroll() {
@@ -224,7 +235,7 @@ TEST_F(AudioRendererBaseTest, Initialize_Failed) {
renderer_->Initialize(
decoder_,
NewExpectedStatusCB(PIPELINE_ERROR_INITIALIZATION_FAILED),
- NewUnderflowClosure());
+ NewUnderflowClosure(), NewAudioTimeClosure());
// We should have no reads.
EXPECT_TRUE(read_cb_.is_null());
@@ -234,7 +245,7 @@ TEST_F(AudioRendererBaseTest, Initialize_Successful) {
EXPECT_CALL(*renderer_, OnInitialize(_, _, _))
.WillOnce(Return(true));
renderer_->Initialize(decoder_, NewExpectedStatusCB(PIPELINE_OK),
- NewUnderflowClosure());
+ NewUnderflowClosure(), NewAudioTimeClosure());
// We should have no reads.
EXPECT_TRUE(read_cb_.is_null());
@@ -357,7 +368,6 @@ TEST_F(AudioRendererBaseTest, Underflow_EndOfStream) {
EXPECT_CALL(host_, NotifyEnded());
EXPECT_CALL(host_, GetTime()).WillOnce(Return(base::TimeDelta()));
- EXPECT_CALL(host_, SetTime(_));
EXPECT_FALSE(ConsumeBufferedData(kDataSize, &muted));
EXPECT_FALSE(muted);
}
« no previous file with comments | « media/filters/audio_renderer_base.cc ('k') | media/filters/video_renderer_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698