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

Unified Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 11887011: Tighten up media::DecoderBuffer data requirements. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
« media/base/decoder_buffer.cc ('K') | « media/filters/ffmpeg_demuxer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer_unittest.cc
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index c1efa8efc2af1eee8405be2b4e4c75549518b139..2c2ff904d9601c6f6395249c616f59f4b465072d 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -618,4 +618,15 @@ TEST_F(FFmpegDemuxerTest, UnsupportedVideoSupportedAudioDemux) {
EXPECT_TRUE(demuxer_->GetStream(DemuxerStream::AUDIO));
}
+// FFmpeg returns null data pointers when samples have zero size, leading to
+// mistakently creating end of stream buffers http://crbug.com/169133
acolwell GONE FROM CHROMIUM 2013/01/17 00:00:08 s/mistakently/mistakenly
scherkus (not reviewing) 2013/01/17 00:16:30 Done.
+TEST_F(FFmpegDemuxerTest, MP4_ZeroStszEntry) {
+#if !defined(USE_PROPRIETARY_CODECS)
acolwell GONE FROM CHROMIUM 2013/01/17 00:00:08 nit: Why don't we just put all these tests in a si
scherkus (not reviewing) 2013/01/17 00:16:30 This way they still get compiled -- alternatively
+ return;
+#endif
+ CreateDemuxer("bear-1280x720-zero-stsz-entry.mp4");
+ InitializeDemuxer();
+ ReadUntilEndOfStream();
+}
+
} // namespace media
« media/base/decoder_buffer.cc ('K') | « media/filters/ffmpeg_demuxer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698