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

Unified Diff: media/base/pipeline_impl_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/base/pipeline_impl_unittest.cc
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index e27bddafc84da056a5914531dbab0d99373af1e4..3be2fa08f753adf8b56b9032caf03694ddfdf005 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -156,8 +156,8 @@ class PipelineImplTest : public ::testing::Test {
// Sets up expectations to allow the video renderer to initialize.
void InitializeVideoRenderer() {
EXPECT_CALL(*mocks_->video_renderer(),
- Initialize(mocks_->video_decoder(), _, _))
- .WillOnce(Invoke(&RunFilterCallback3));
+ Initialize(mocks_->video_decoder(), _, _, _))
+ .WillOnce(Invoke(&RunFilterCallback4));
EXPECT_CALL(*mocks_->video_renderer(), SetPlaybackRate(0.0f));
EXPECT_CALL(*mocks_->video_renderer(),
Seek(mocks_->demuxer()->GetStartTime(), _))
@@ -170,13 +170,13 @@ class PipelineImplTest : public ::testing::Test {
void InitializeAudioRenderer(bool disable_after_init_callback = false) {
if (disable_after_init_callback) {
EXPECT_CALL(*mocks_->audio_renderer(),
- Initialize(mocks_->audio_decoder(), _, _))
- .WillOnce(DoAll(Invoke(&RunFilterCallback3),
+ Initialize(mocks_->audio_decoder(), _, _, _))
+ .WillOnce(DoAll(Invoke(&RunFilterCallback4),
DisableAudioRenderer(mocks_->audio_renderer())));
} else {
EXPECT_CALL(*mocks_->audio_renderer(),
- Initialize(mocks_->audio_decoder(), _, _))
- .WillOnce(Invoke(&RunFilterCallback3));
+ Initialize(mocks_->audio_decoder(), _, _, _))
+ .WillOnce(Invoke(&RunFilterCallback4));
}
EXPECT_CALL(*mocks_->audio_renderer(), SetPlaybackRate(0.0f));
EXPECT_CALL(*mocks_->audio_renderer(), SetVolume(1.0f));

Powered by Google App Engine
This is Rietveld 408576698