summaryrefslogtreecommitdiffstats
path: root/media/base/pipeline_impl_unittest.cc
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 21:44:49 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 21:44:49 +0000
commit1a04eb71a548d34aee96b7dde4da34098fa851a2 (patch)
treea06cd0ae5afe551f9343a22917a06a2bccf7df9d /media/base/pipeline_impl_unittest.cc
parent5ed25b3e6f4a9da2b0dfe7b0787f4715cf27ef2e (diff)
downloadchromium_src-1a04eb71a548d34aee96b7dde4da34098fa851a2.zip
chromium_src-1a04eb71a548d34aee96b7dde4da34098fa851a2.tar.gz
chromium_src-1a04eb71a548d34aee96b7dde4da34098fa851a2.tar.bz2
Improve audio underflow handling.
- Added support for increasing decoded audio queue size. - Added a mechanism to notify the pipeline when the audio underflows. - Delay resuming audio playback until the audio queue has filled up. BUG=92254 TEST=AudioRendererBaseTest.Underflow Review URL: http://codereview.chromium.org/8356022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline_impl_unittest.cc')
-rw-r--r--media/base/pipeline_impl_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index d6b5068..07f773d 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -163,13 +163,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(&RunFilterCallback),
+ Initialize(mocks_->audio_decoder(), _, _))
+ .WillOnce(DoAll(Invoke(&RunFilterCallback3),
DisableAudioRenderer(mocks_->audio_renderer())));
} else {
EXPECT_CALL(*mocks_->audio_renderer(),
- Initialize(mocks_->audio_decoder(), _))
- .WillOnce(Invoke(&RunFilterCallback));
+ Initialize(mocks_->audio_decoder(), _, _))
+ .WillOnce(Invoke(&RunFilterCallback3));
}
EXPECT_CALL(*mocks_->audio_renderer(), SetPlaybackRate(0.0f));
EXPECT_CALL(*mocks_->audio_renderer(), SetVolume(1.0f));