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

Unified Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 2737653002: Buffer 2 seconds of data in the ffmpeg demuxer. (Closed)
Patch Set: UnmarkEndOfStream -> UnmarkEndOfStreamAndClearError Created 3 years, 9 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 3cfb72f70ebb62a5bdaf6e92df6dbf162d1939f7..a5d510de49744cc94600163e80cfe27aede9018f 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -482,7 +482,7 @@ TEST_F(FFmpegDemuxerTest, Read_Audio) {
audio->Read(NewReadCB(FROM_HERE, 27, 3000, true));
base::RunLoop().Run();
- EXPECT_EQ(22084, demuxer_->GetMemoryUsage());
+ EXPECT_EQ(166866, demuxer_->GetMemoryUsage());
}
TEST_F(FFmpegDemuxerTest, Read_Video) {
@@ -499,7 +499,7 @@ TEST_F(FFmpegDemuxerTest, Read_Video) {
video->Read(NewReadCB(FROM_HERE, 1057, 33000, false));
base::RunLoop().Run();
- EXPECT_EQ(323, demuxer_->GetMemoryUsage());
+ EXPECT_EQ(148778, demuxer_->GetMemoryUsage());
}
TEST_F(FFmpegDemuxerTest, Read_Text) {
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | third_party/WebKit/LayoutTests/http/tests/media/video-load-metadata-decode-error.cgi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698