summaryrefslogtreecommitdiffstats
path: root/media/webm/webm_stream_parser.h
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-26 04:33:06 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-26 04:33:06 +0000
commit4205f0aab39ea675109407d710e251e81e21a594 (patch)
tree5ae72018803fc8025d35aa0d15c68c09a4dfb7ae /media/webm/webm_stream_parser.h
parent509e25c20ca3e44bd9b2078841606e1e2cba56ff (diff)
downloadchromium_src-4205f0aab39ea675109407d710e251e81e21a594.zip
chromium_src-4205f0aab39ea675109407d710e251e81e21a594.tar.gz
chromium_src-4205f0aab39ea675109407d710e251e81e21a594.tar.bz2
Fire needkey event when encrypted media is encounted.
BUG=119843 TEST=Modified media_unittests passes. Also the revised demo page works. Review URL: http://codereview.chromium.org/10223010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/webm/webm_stream_parser.h')
-rw-r--r--media/webm/webm_stream_parser.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/webm/webm_stream_parser.h b/media/webm/webm_stream_parser.h
index 0311297..0d37992 100644
--- a/media/webm/webm_stream_parser.h
+++ b/media/webm/webm_stream_parser.h
@@ -24,7 +24,8 @@ class WebMStreamParser : public StreamParser {
// StreamParser implementation.
virtual void Init(const InitCB& init_cb, const NewConfigCB& config_cb,
const NewBuffersCB& audio_cb,
- const NewBuffersCB& video_cb) OVERRIDE;
+ const NewBuffersCB& video_cb,
+ const KeyNeededCB& key_needed_cb) OVERRIDE;
virtual void Flush() OVERRIDE;
virtual bool Parse(const uint8* buf, int size) OVERRIDE;
@@ -62,6 +63,7 @@ class WebMStreamParser : public StreamParser {
NewConfigCB config_cb_;
NewBuffersCB audio_cb_;
NewBuffersCB video_cb_;
+ KeyNeededCB key_needed_cb_;
scoped_ptr<WebMClusterParser> cluster_parser_;
ByteQueue byte_queue_;