Index: media/filters/ffmpeg_demuxer_unittest.cc |
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc |
index 1e9024e557b17bc36f8242e3ad9b563404e4dc3a..df5ab88bfac91f62674286dd3455b0cb3161305b 100644 |
--- a/media/filters/ffmpeg_demuxer_unittest.cc |
+++ b/media/filters/ffmpeg_demuxer_unittest.cc |
@@ -110,7 +110,7 @@ class FFmpegDemuxerTest : public testing::Test { |
media::PipelineStatus expected_pipeline_status, |
base::Time timeline_offset) { |
if (expected_pipeline_status == PIPELINE_OK) |
- EXPECT_CALL(host_, SetDuration(_)); |
+ EXPECT_CALL(host_, SetDuration(_)).Times(AnyNumber()); |
WaitableMessageLoopEvent event; |
demuxer_->Initialize(&host_, event.GetPipelineStatusCB(), enable_text); |
demuxer_->timeline_offset_ = timeline_offset; |
@@ -222,8 +222,10 @@ class FFmpegDemuxerTest : public testing::Test { |
} |
// Accessor to demuxer internals. |
- void set_duration_known(bool duration_known) { |
+ void SetDurationKnown(bool duration_known) { |
demuxer_->duration_known_ = duration_known; |
+ if (!duration_known) |
+ demuxer_->duration_ = kInfiniteDuration; |
} |
bool IsStreamStopped(DemuxerStream::Type type) { |
@@ -803,7 +805,7 @@ TEST_F(FFmpegDemuxerTest, Read_EndOfStream_NoDuration) { |
// Verify that end of stream buffers are created. |
CreateDemuxer("bear-320x240.webm"); |
InitializeDemuxer(); |
- set_duration_known(false); |
+ SetDurationKnown(false); |
EXPECT_CALL(host_, SetDuration(base::TimeDelta::FromMilliseconds(2767))); |
ReadUntilEndOfStream(demuxer_->GetStream(DemuxerStream::AUDIO)); |
ReadUntilEndOfStream(demuxer_->GetStream(DemuxerStream::VIDEO)); |
@@ -813,7 +815,7 @@ TEST_F(FFmpegDemuxerTest, Read_EndOfStream_NoDuration_VideoOnly) { |
// Verify that end of stream buffers are created. |
CreateDemuxer("bear-320x240-video-only.webm"); |
InitializeDemuxer(); |
- set_duration_known(false); |
+ SetDurationKnown(false); |
EXPECT_CALL(host_, SetDuration(base::TimeDelta::FromMilliseconds(2736))); |
ReadUntilEndOfStream(demuxer_->GetStream(DemuxerStream::VIDEO)); |
} |
@@ -822,7 +824,7 @@ TEST_F(FFmpegDemuxerTest, Read_EndOfStream_NoDuration_AudioOnly) { |
// Verify that end of stream buffers are created. |
CreateDemuxer("bear-320x240-audio-only.webm"); |
InitializeDemuxer(); |
- set_duration_known(false); |
+ SetDurationKnown(false); |
EXPECT_CALL(host_, SetDuration(base::TimeDelta::FromMilliseconds(2767))); |
ReadUntilEndOfStream(demuxer_->GetStream(DemuxerStream::AUDIO)); |
} |
@@ -832,7 +834,7 @@ TEST_F(FFmpegDemuxerTest, Read_EndOfStream_NoDuration_UnsupportedStream) { |
// if there are streams in the file that we don't support. |
CreateDemuxer("vorbis_audio_wmv_video.mkv"); |
InitializeDemuxer(); |
- set_duration_known(false); |
+ SetDurationKnown(false); |
EXPECT_CALL(host_, SetDuration(base::TimeDelta::FromMilliseconds(1014))); |
ReadUntilEndOfStream(demuxer_->GetStream(DemuxerStream::AUDIO)); |
} |