summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
Diffstat (limited to 'media/base')
-rw-r--r--media/base/pipeline_impl.cc1
-rw-r--r--media/base/pipeline_impl_unittest.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index 2555bd7..f574b85 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -367,6 +367,7 @@ void PipelineImpl::ResetState() {
video_width_ = 0;
video_height_ = 0;
volume_ = 1.0f;
+ preload_ = AUTO;
playback_rate_ = 0.0f;
status_ = PIPELINE_OK;
has_audio_ = false;
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index 87f3e96..2028e7a 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -100,6 +100,7 @@ class PipelineImplTest : public ::testing::Test {
mocks_->demuxer()->SetTotalAndBufferedBytesAndDuration(
kTotalBytes, kBufferedBytes, duration);
EXPECT_CALL(*mocks_->demuxer(), SetPlaybackRate(0.0f));
+ EXPECT_CALL(*mocks_->demuxer(), SetPreload(AUTO));
EXPECT_CALL(*mocks_->demuxer(), Seek(base::TimeDelta(), NotNull()))
.WillOnce(Invoke(&RunFilterCallback));
EXPECT_CALL(*mocks_->demuxer(), Stop(NotNull()))
@@ -850,4 +851,3 @@ TEST(PipelineStatusNotificationTest, DelayedCallback) {
}
} // namespace media
-