diff options
author | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-12 09:01:00 +0000 |
---|---|---|
committer | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-12 09:01:00 +0000 |
commit | 15af2b58ceeddb4bdb08fc9c58f9f9de3b372687 (patch) | |
tree | a28e94c785f28ba8fdd969fb80e4066e3ee0b572 /media/base/pipeline_unittest.cc | |
parent | 193bacdf287c87aab760f6ea25fff8bda6326c60 (diff) | |
download | chromium_src-15af2b58ceeddb4bdb08fc9c58f9f9de3b372687.zip chromium_src-15af2b58ceeddb4bdb08fc9c58f9f9de3b372687.tar.gz chromium_src-15af2b58ceeddb4bdb08fc9c58f9f9de3b372687.tar.bz2 |
Revert 136679 - Delete MockDataSource, remove IsLocalSource & IsSeekable from Demuxer/Pipeline.
It broke LayoutTests/http/tests/media/media-source/webm/video-media-source-seek.html
and video-media-source-state-changes.html.
http://test-results.appspot.com/dashboards/flakiness_dashboard.html#showExpectations=true&showLargeExpectations=true&tests=http%2Ftests%2Fmedia%2Fmedia-source%2Fwebm%2Fvideo-media-source-seek.html%2Chttp%2Ftests%2Fmedia%2Fmedia-source%2Fwebm%2Fvideo-media-source-state-changes.html
Review URL: https://chromiumcodereview.appspot.com/10378100
TBR=fischman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10378119
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline_unittest.cc')
-rw-r--r-- | media/base/pipeline_unittest.cc | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc index 888b962..56d39ff 100644 --- a/media/base/pipeline_unittest.cc +++ b/media/base/pipeline_unittest.cc @@ -36,6 +36,8 @@ namespace media { static const int kTotalBytes = 1024; static const int kBufferedBytes = 1024; static const int kBitrate = 1234; +static const bool kLocalSource = false; +static const bool kSeekable = true; ACTION_P(InitializeDemuxerWithError, error) { arg1.Run(error); @@ -115,6 +117,10 @@ class PipelineTest : public ::testing::Test { // Demuxer properties. EXPECT_CALL(*mocks_->demuxer(), GetBitrate()) .WillRepeatedly(Return(kBitrate)); + EXPECT_CALL(*mocks_->demuxer(), IsLocalSource()) + .WillRepeatedly(Return(kLocalSource)); + EXPECT_CALL(*mocks_->demuxer(), IsSeekable()) + .WillRepeatedly(Return(kSeekable)); // Configure the demuxer to return the streams. for (size_t i = 0; i < streams->size(); ++i) { @@ -794,6 +800,24 @@ TEST_F(PipelineTest, StartTimeIsNonZero) { EXPECT_EQ(kStartTime, pipeline_->GetCurrentTime()); } +TEST_F(PipelineTest, DemuxerProperties) { + CreateAudioStream(); + CreateVideoStream(); + MockDemuxerStreamVector streams; + streams.push_back(audio_stream()); + streams.push_back(video_stream()); + + InitializeDemuxer(&streams); + InitializeAudioDecoder(audio_stream()); + InitializeAudioRenderer(); + InitializeVideoDecoder(video_stream()); + InitializeVideoRenderer(); + InitializePipeline(PIPELINE_OK); + + EXPECT_EQ(kLocalSource, pipeline_->IsLocalSource()); + EXPECT_NE(kSeekable, pipeline_->IsStreaming()); +} + class FlexibleCallbackRunner : public base::DelegateSimpleThread::Delegate { public: FlexibleCallbackRunner(base::TimeDelta delay, PipelineStatus status, |