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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/ffmpeg_audio_decoder_unittest.cc

Issue 9295020: Fix ChunkDemuxer seek deadlock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: _ Created 8 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/filters/chunk_demuxer.cc ('K') | « media/filters/ffmpeg_audio_decoder.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | media/filters/ffmpeg_video_decoder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_audio_decoder_unittest.cc
diff --git a/media/filters/ffmpeg_audio_decoder_unittest.cc b/media/filters/ffmpeg_audio_decoder_unittest.cc
index 12e2ce6c506a57c1f9e6a385458f0489ca304794..0efe91e8f4a939ff728ff3d7c66bb961cadab1d9 100644
--- a/media/filters/ffmpeg_audio_decoder_unittest.cc
+++ b/media/filters/ffmpeg_audio_decoder_unittest.cc
@@ -180,4 +180,20 @@ TEST_F(FFmpegAudioDecoderTest, ProduceAudioSamples) {
Stop();
}
+TEST_F(FFmpegAudioDecoderTest, ReadAbort) {
+ Initialize();
+
+ encoded_audio_.clear();
+ encoded_audio_.push_back(NULL);
+
+ EXPECT_CALL(*demuxer_, Read(_))
+ .WillOnce(InvokeReadPacket(this));
+ Read();
+
+ EXPECT_EQ(decoded_audio_.size(), 1u);
+ EXPECT_TRUE(decoded_audio_[0].get() == NULL);
+
+ Stop();
+}
+
} // namespace media
« media/filters/chunk_demuxer.cc ('K') | « media/filters/ffmpeg_audio_decoder.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | media/filters/ffmpeg_video_decoder.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698