diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-16 01:27:36 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-16 01:27:36 +0000 |
| commit | cbdc8c2b4b46c7e7886c9e99bc595a0b9936b381 (patch) | |
| tree | fd03ab4a8636680c4c2dff01880751e25ef0cdca /media/webm | |
| parent | 46b7d64e85a9d8d28372d05b59b295dd6ecb0bc8 (diff) | |
| download | chromium_src-cbdc8c2b4b46c7e7886c9e99bc595a0b9936b381.zip chromium_src-cbdc8c2b4b46c7e7886c9e99bc595a0b9936b381.tar.gz chromium_src-cbdc8c2b4b46c7e7886c9e99bc595a0b9936b381.tar.bz2 | |
Generalize AesDecryptor to make it more spec compliant.
BUG=123260
TEST=media_unittests, encrypted-media layout tests.
Review URL: https://chromiumcodereview.appspot.com/10534096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142553 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/webm')
| -rw-r--r-- | media/webm/webm_stream_parser.cc | 8 | ||||
| -rw-r--r-- | media/webm/webm_stream_parser.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/media/webm/webm_stream_parser.cc b/media/webm/webm_stream_parser.cc index b063a26..38c5a7e 100644 --- a/media/webm/webm_stream_parser.cc +++ b/media/webm/webm_stream_parser.cc @@ -191,14 +191,14 @@ void WebMStreamParser::Init(const InitCB& init_cb, const NewConfigCB& config_cb, const NewBuffersCB& audio_cb, const NewBuffersCB& video_cb, - const KeyNeededCB& key_needed_cb, + const NeedKeyCB& need_key_cb, const NewMediaSegmentCB& new_segment_cb) { DCHECK_EQ(state_, kWaitingForInit); DCHECK(init_cb_.is_null()); DCHECK(!init_cb.is_null()); DCHECK(!config_cb.is_null()); DCHECK(!audio_cb.is_null() || !video_cb.is_null()); - DCHECK(!key_needed_cb.is_null()); + DCHECK(!need_key_cb.is_null()); DCHECK(!new_segment_cb.is_null()); ChangeState(kParsingHeaders); @@ -206,7 +206,7 @@ void WebMStreamParser::Init(const InitCB& init_cb, config_cb_ = config_cb; audio_cb_ = audio_cb; video_cb_ = video_cb; - key_needed_cb_ = key_needed_cb; + need_key_cb_ = need_key_cb; new_segment_cb_ = new_segment_cb; } @@ -354,7 +354,7 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) { CHECK_GT(key_id_size, 0); scoped_array<uint8> key_id(new uint8[key_id_size]); memcpy(key_id.get(), tracks_parser.video_encryption_key_id(), key_id_size); - key_needed_cb_.Run(key_id.Pass(), key_id_size); + need_key_cb_.Run(key_id.Pass(), key_id_size); } cluster_parser_.reset(new WebMClusterParser( diff --git a/media/webm/webm_stream_parser.h b/media/webm/webm_stream_parser.h index 003171e..f555278 100644 --- a/media/webm/webm_stream_parser.h +++ b/media/webm/webm_stream_parser.h @@ -25,7 +25,7 @@ class WebMStreamParser : public StreamParser { virtual void Init(const InitCB& init_cb, const NewConfigCB& config_cb, const NewBuffersCB& audio_cb, const NewBuffersCB& video_cb, - const KeyNeededCB& key_needed_cb, + const NeedKeyCB& need_key_cb, const NewMediaSegmentCB& new_segment_cb) OVERRIDE; virtual void Flush() OVERRIDE; virtual bool Parse(const uint8* buf, int size) OVERRIDE; @@ -64,7 +64,7 @@ class WebMStreamParser : public StreamParser { NewConfigCB config_cb_; NewBuffersCB audio_cb_; NewBuffersCB video_cb_; - KeyNeededCB key_needed_cb_; + NeedKeyCB need_key_cb_; NewMediaSegmentCB new_segment_cb_; // True if a new cluster id has been seen, but no audio or video buffers have |