Support for parsing encrypted WebM streams by src.

webkit/media/filter_helpers.h

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 need something in base for this
callback. Currently, NeedKeyCB is in media/base/stream_parser.h, but we could
move it elsewhere.

[fgalligan1, 2012/08/23 02:39:11]

Right, what I was thinking of doing was creating a new interface NeedKey or
something that both ChunkDemuxer and FFmpegDemuxer would implement. I just
didn't have time to do it. Added a TODO.

[xhwang, 2012/08/23 19:04:53]

Yes, having ChunkDemuxer and FFmpegDemuxer share the same way to report NeedKey
would be great!

 
 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