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

Unified Diff: webkit/media/filter_helpers.h

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/webm/webm_stream_parser.cc ('k') | webkit/media/filter_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/filter_helpers.h
diff --git a/webkit/media/filter_helpers.h b/webkit/media/filter_helpers.h
index bfa8b891e369d88df4aac9267bcc1165d7132521..b30ecd2fcdf8355e61cd60a83c7209a7097c7f7c 100644
--- a/webkit/media/filter_helpers.h
+++ b/webkit/media/filter_helpers.h
@@ -7,6 +7,8 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
+// TODO(fgalligan): Remove the dependency on FFmpeg.
+#include "media/filters/ffmpeg_demuxer.h"
namespace base {
class MessageLoopProxy;
@@ -33,7 +35,8 @@ 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);
} // webkit_media
« no previous file with comments | « media/webm/webm_stream_parser.cc ('k') | webkit/media/filter_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698