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

Unified Diff: webkit/media/filter_helpers.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 | « webkit/media/filter_helpers.h ('k') | webkit/media/webmediaplayer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/filter_helpers.cc
diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
index 4308f9aa03d92d0dc0d9b9f738a0a34e365db19e..df584a4f6243aad5f4e5de5288041575f0a1dde7 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -72,9 +72,10 @@ void BuildMediaSourceCollection(
void BuildDefaultCollection(
const scoped_refptr<media::DataSource>& data_source,
const scoped_refptr<base::MessageLoopProxy>& message_loop,
- media::FilterCollection* filter_collection) {
+ media::FilterCollection* filter_collection,
+ const media::FFmpegNeedKeyCB& need_key_cb) {
filter_collection->SetDemuxer(new media::FFmpegDemuxer(
- message_loop, data_source));
+ message_loop, data_source, need_key_cb));
AddDefaultDecodersToCollection(message_loop, filter_collection);
}
« no previous file with comments | « webkit/media/filter_helpers.h ('k') | webkit/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698