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

Unified Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 10829470: Support for parsing encrypted WebM streams by src. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Refactored decryption code. Add 2 unittests. Created 7 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_demuxer_unittest.cc
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index af2cd92528527c8175c1192a5619717908838ebc..fc17d3362216cb16e111f52828d88918ace6c975 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -77,8 +77,12 @@ class FFmpegDemuxerTest : public testing::Test {
EXPECT_CALL(host_, AddBufferedTimeRange(_, _)).Times(AnyNumber());
CreateDataSource(name);
+
+ media::FFmpegNeedKeyCB need_key_cb =
+ base::Bind(&FFmpegDemuxerTest::NeedKeyCB, base::Unretained(this));
demuxer_ = new FFmpegDemuxer(message_loop_.message_loop_proxy(),
- data_source_);
+ data_source_,
+ need_key_cb);
xhwang 2013/03/12 17:28:57 Can we actually add a test with an encrypted file
fgalligan1 2013/03/13 17:58:09 Added a test. Please take a look.
}
MOCK_METHOD1(CheckPoint, void(int v));
@@ -173,6 +177,10 @@ class FFmpegDemuxerTest : public testing::Test {
EXPECT_TRUE(data_source_->Initialize(file_path));
}
+ void NeedKeyCB(const std::string& type,
+ scoped_array<uint8> init_data, int init_data_size) {
+ }
+
DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxerTest);
};

Powered by Google App Engine
This is Rietveld 408576698