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

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: Created 8 years, 4 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: webkit/media/filter_helpers.h
diff --git a/webkit/media/filter_helpers.h b/webkit/media/filter_helpers.h
index b130ddf87f62398a40f120b554af9fb01e3ae549..fef23edbcfa77a1295b867eb9151bad932e625ac 100644
--- a/webkit/media/filter_helpers.h
+++ b/webkit/media/filter_helpers.h
@@ -7,6 +7,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
+#include "media/filters/ffmpeg_demuxer.h"
ddorwin 2012/08/22 23:20:29 This shouldn't rely on FFmpeg-specific code. We ne
fgalligan1 2012/08/23 02:39:11 Right, what I was thinking of doing was creating a
xhwang 2012/08/23 19:04:53 Yes, having ChunkDemuxer and FFmpegDemuxer share t
namespace media {
class Decryptor;
@@ -52,7 +53,8 @@ void BuildDefaultCollection(
const scoped_refptr<media::DataSource>& data_source,
media::MessageLoopFactory* message_loop_factory,
media::FilterCollection* filter_collection,
- media::Decryptor* decryptor);
+ media::Decryptor* decryptor,
+ const media::FFmpegNeedKeyCB& need_key_cb);
} // webkit_media

Powered by Google App Engine
This is Rietveld 408576698