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

Unified Diff: media/filters/audio_file_reader_unittest.cc

Issue 12224114: Guard against midstream audio configuration changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments. Created 7 years, 10 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
« no previous file with comments | « media/filters/audio_file_reader.cc ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/audio_file_reader_unittest.cc
diff --git a/media/filters/audio_file_reader_unittest.cc b/media/filters/audio_file_reader_unittest.cc
index 72c26038f3e239bb6244e7bf48dc1302fd68b1c4..64c58e089f53dde585348f14113413040f2292d0 100644
--- a/media/filters/audio_file_reader_unittest.cc
+++ b/media/filters/audio_file_reader_unittest.cc
@@ -73,11 +73,19 @@ class AudioFileReaderTest : public testing::Test {
ReadAndVerify(hash, trimmed_frames);
}
- void RunFailingTest(const char* fn) {
+ void RunTestFailingDemux(const char* fn) {
Initialize(fn);
EXPECT_FALSE(reader_->Open());
}
+ void RunTestFailingDecode(const char* fn) {
+ Initialize(fn);
+ EXPECT_TRUE(reader_->Open());
+ scoped_ptr<AudioBus> decoded_audio_data = AudioBus::Create(
+ reader_->channels(), reader_->number_of_frames());
+ EXPECT_EQ(reader_->Read(decoded_audio_data.get()), 0);
+ }
+
protected:
scoped_refptr<DecoderBuffer> data_;
scoped_ptr<InMemoryUrlProtocol> protocol_;
@@ -91,7 +99,7 @@ TEST_F(AudioFileReaderTest, WithoutOpen) {
}
TEST_F(AudioFileReaderTest, InvalidFile) {
- RunFailingTest("ten_byte_file");
+ RunTestFailingDemux("ten_byte_file");
}
TEST_F(AudioFileReaderTest, WithVideo) {
@@ -134,10 +142,14 @@ TEST_F(AudioFileReaderTest, AAC) {
RunTest("sfx.m4a", NULL, 1, 44100,
base::TimeDelta::FromMicroseconds(312001), 13759, 13312);
}
+
+TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) {
+ RunTestFailingDecode("midstream_config_change.mp3");
+}
#endif
TEST_F(AudioFileReaderTest, VorbisInvalidChannelLayout) {
- RunFailingTest("9ch.ogg");
+ RunTestFailingDemux("9ch.ogg");
}
TEST_F(AudioFileReaderTest, WaveValidFourChannelLayout) {
« no previous file with comments | « media/filters/audio_file_reader.cc ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698