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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Addressing comments. 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
« media/filters/ffmpeg_demuxer.cc ('K') | « media/filters/ffmpeg_demuxer.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 b130ddf87f62398a40f120b554af9fb01e3ae549..8aec04ac34505d2957fff13c56ed70bd14ac7e69 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"
+#include "media/filters/ffmpeg_demuxer.h"
+// TODO(fgalligan): Remove the dependency on FFmpeg.
ddorwin 2012/08/24 00:20:30 above line 10
fgalligan1 2012/08/24 20:01:26 Done.
namespace media {
class Decryptor;
@@ -52,7 +54,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
« media/filters/ffmpeg_demuxer.cc ('K') | « media/filters/ffmpeg_demuxer.cc ('k') | webkit/media/filter_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698