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

Unified Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 1230793009: Initial support for the desktop media pipeline on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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/filters/ffmpeg_demuxer_unittest.cc
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 961ae83daa0ddffb7ded44a2c119372a65a3deca..9493634fa6a29fc99ae4017174f2932bc94629f8 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -636,7 +636,14 @@ TEST_F(FFmpegDemuxerTest, Read_EndOfStream_NoDuration_VideoOnly) {
CreateDemuxer("bear-320x240-video-only.webm");
InitializeDemuxer();
set_duration_known(false);
- EXPECT_CALL(host_, SetDuration(base::TimeDelta::FromMilliseconds(2703)));
+ // FFmpeg produces two durations: one from the container and one from the
+ // stream. If decoders are disabled, only the container one is available.
+#if defined(DISABLE_FFMPEG_VIDEO_DECODERS)
+ auto expected_duration = base::TimeDelta::FromMilliseconds(2736);
+#else
+ auto expected_duration = base::TimeDelta::FromMilliseconds(2703);
+#endif
+ EXPECT_CALL(host_, SetDuration(expected_duration));
ReadUntilEndOfStream(demuxer_->GetStream(DemuxerStream::VIDEO));
}

Powered by Google App Engine
This is Rietveld 408576698