Support for parsing encrypted WebM streams by src.

webkit/media/filter_helpers.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_MEDIA_FILTER_HELPERS_H_
 #define WEBKIT_MEDIA_FILTER_HELPERS_H_
 
 #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;
 class ChunkDemuxerClient;
 class DataSource;
 class FFmpegVideoDecoder;
 class FilterCollection;
 class MessageLoopFactory;
 }
 
@@ skipping 25 matching lines @@
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
     media::Decryptor* decryptor);
 
 // Builds the required filters for handling regular URLs and adds them to
 // |filter_collection| and fills |video_decoder| returning true if successful.
 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
 
 #endif  // WEBKIT_MEDIA_FILTER_HELPERS_H_