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

Unified Diff: media/filters/ffmpeg_audio_decoder_unittest.cc

Issue 9325044: Remove AudioDecoder from the Filter heirarchy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CR responses. Created 8 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/ffmpeg_audio_decoder.cc ('k') | media/media.gyp » ('j') | no next file with comments »
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 b9f073d819cc161abad703d0b9c2e7c627daba83..f580e799cc6dd26edb4fa454256182530c86aab5 100644
--- a/media/filters/ffmpeg_audio_decoder_unittest.cc
+++ b/media/filters/ffmpeg_audio_decoder_unittest.cc
@@ -77,11 +77,6 @@ class FFmpegAudioDecoderTest : public testing::Test {
message_loop_.RunAllPending();
}
- void Stop() {
- decoder_->Stop(NewExpectedClosure());
- message_loop_.RunAllPending();
- }
-
void ReadPacket(const DemuxerStream::ReadCallback& read_callback) {
CHECK(!encoded_audio_.empty()) << "ReadPacket() called too many times";
@@ -134,17 +129,6 @@ TEST_F(FFmpegAudioDecoderTest, Initialize) {
EXPECT_EQ(16, decoder_->bits_per_channel());
EXPECT_EQ(CHANNEL_LAYOUT_STEREO, decoder_->channel_layout());
EXPECT_EQ(44100, decoder_->samples_per_second());
-
- Stop();
-}
-
-TEST_F(FFmpegAudioDecoderTest, Flush) {
- Initialize();
-
- decoder_->Flush(NewExpectedClosure());
- message_loop_.RunAllPending();
-
- Stop();
}
TEST_F(FFmpegAudioDecoderTest, ProduceAudioSamples) {
@@ -176,8 +160,6 @@ TEST_F(FFmpegAudioDecoderTest, ProduceAudioSamples) {
Read();
ASSERT_EQ(4u, decoded_audio_.size());
ExpectEndOfStream(3);
-
- Stop();
}
TEST_F(FFmpegAudioDecoderTest, ReadAbort) {
@@ -192,8 +174,6 @@ TEST_F(FFmpegAudioDecoderTest, ReadAbort) {
EXPECT_EQ(decoded_audio_.size(), 1u);
EXPECT_TRUE(decoded_audio_[0].get() == NULL);
-
- Stop();
}
} // namespace media
« no previous file with comments | « media/filters/ffmpeg_audio_decoder.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698