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

Unified Diff: media/filters/ffmpeg_audio_decoder_unittest.cc

Issue 9632024: Create video and audio decoder threads on demand. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Log an error when Initialize is called more than once. Created 8 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_audio_decoder_unittest.cc
diff --git a/media/filters/ffmpeg_audio_decoder_unittest.cc b/media/filters/ffmpeg_audio_decoder_unittest.cc
index 0c7bed56ede4fb3e3ae84cb1b8e5bf7e81621f76..2c97058c120c13fa996cc2a9abe599ec565e646f 100644
--- a/media/filters/ffmpeg_audio_decoder_unittest.cc
+++ b/media/filters/ffmpeg_audio_decoder_unittest.cc
@@ -13,6 +13,7 @@
#include "media/base/test_data_util.h"
#include "media/ffmpeg/ffmpeg_common.h"
#include "media/filters/ffmpeg_audio_decoder.h"
+#include "media/filters/ffmpeg_decoder_unittest.h"
#include "media/filters/ffmpeg_glue.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -25,11 +26,12 @@ namespace media {
ACTION_P(InvokeReadPacket, test) {
test->ReadPacket(arg0);
}
-
+
class FFmpegAudioDecoderTest : public testing::Test {
- public:
+ public:
FFmpegAudioDecoderTest()
- : decoder_(new FFmpegAudioDecoder(&message_loop_)),
+ : decoder_(new FFmpegAudioDecoder(base::Bind(&Identity<MessageLoop*>,
+ &message_loop_))),
demuxer_(new StrictMock<MockDemuxerStream>()) {
CHECK(FFmpegGlue::GetInstance());

Powered by Google App Engine
This is Rietveld 408576698