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

Unified Diff: media/tools/seek_tester/seek_tester.cc

Issue 10829470: Support for parsing encrypted WebM streams by src. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tool player_x11 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
« no previous file with comments | « media/tools/player_x11/player_x11.cc ('k') | media/webm/webm_cluster_parser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/tools/seek_tester/seek_tester.cc
diff --git a/media/tools/seek_tester/seek_tester.cc b/media/tools/seek_tester/seek_tester.cc
index ba9f6fba5d34f4f0c620d5c9399b3408eed954bb..29e7ef88353960c2abaef88090feb253075335a0 100644
--- a/media/tools/seek_tester/seek_tester.cc
+++ b/media/tools/seek_tester/seek_tester.cc
@@ -53,6 +53,11 @@ void TimestampExtractor(uint64* timestamp_ms,
loop->PostTask(FROM_HERE, MessageLoop::QuitClosure());
}
+static void NeedKey(const std::string& type, scoped_array<uint8> init_data,
+ int init_data_size) {
+ LOG(INFO) << "File is encrypted.";
+}
+
int main(int argc, char** argv) {
base::AtExitManager at_exit;
media::InitializeMediaLibraryForTesting();
@@ -67,8 +72,10 @@ int main(int argc, char** argv) {
DemuxerHostImpl host;
MessageLoop loop;
media::PipelineStatusCB quitter = base::Bind(&QuitMessageLoop, &loop);
+ media::FFmpegNeedKeyCB need_key_cb = base::Bind(&NeedKey);
scoped_refptr<media::FFmpegDemuxer> demuxer(
- new media::FFmpegDemuxer(loop.message_loop_proxy(), file_data_source));
+ new media::FFmpegDemuxer(loop.message_loop_proxy(), file_data_source,
+ need_key_cb));
demuxer->Initialize(&host, quitter);
loop.Run();
« no previous file with comments | « media/tools/player_x11/player_x11.cc ('k') | media/webm/webm_cluster_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698