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

Unified Diff: media/tools/player_x11/player_x11.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/demuxer_bench/demuxer_bench.cc ('k') | media/tools/seek_tester/seek_tester.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/tools/player_x11/player_x11.cc
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index 96f07b1de31c1671973497b555f4cb9c3db93c13..6fc4e475b4dca9d30d7b1e87c5052d43d52caa54 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -94,6 +94,11 @@ void Paint(MessageLoop* message_loop, const PaintCB& paint_cb,
static void OnBufferingState(media::Pipeline::BufferingState buffering_state) {}
+static void NeedKey(const std::string& type, scoped_array<uint8> init_data,
+ int init_data_size) {
+ std::cout << "File is encrypted." << std::endl;
+}
+
// TODO(vrk): Re-enabled audio. (crbug.com/112159)
bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop,
const scoped_refptr<media::DataSource>& data_source,
@@ -104,7 +109,9 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop,
// Create our filter factories.
scoped_ptr<media::FilterCollection> collection(
new media::FilterCollection());
- collection->SetDemuxer(new media::FFmpegDemuxer(message_loop, data_source));
+ media::FFmpegNeedKeyCB need_key_cb = base::Bind(&NeedKey);
+ collection->SetDemuxer(new media::FFmpegDemuxer(message_loop, data_source,
+ need_key_cb));
collection->GetAudioDecoders()->push_back(new media::FFmpegAudioDecoder(
message_loop));
collection->GetVideoDecoders()->push_back(new media::FFmpegVideoDecoder(
« no previous file with comments | « media/tools/demuxer_bench/demuxer_bench.cc ('k') | media/tools/seek_tester/seek_tester.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698