diff options
| author | fgalligan@chromium.org <fgalligan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-18 09:00:36 +0000 |
|---|---|---|
| committer | fgalligan@chromium.org <fgalligan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-18 09:00:36 +0000 |
| commit | f7a69d1d3dd0cf1cce5dbb6483d78476614344d6 (patch) | |
| tree | da4de22bdbeccdd42d8b14c6ffe054a26686a2ac /media/mp4 | |
| parent | 6dd33d9c6ff2c9dbca544c0abb25d9c2977556a5 (diff) | |
| download | chromium_src-f7a69d1d3dd0cf1cce5dbb6483d78476614344d6.zip chromium_src-f7a69d1d3dd0cf1cce5dbb6483d78476614344d6.tar.gz chromium_src-f7a69d1d3dd0cf1cce5dbb6483d78476614344d6.tar.bz2 | |
We are removing checksum/HMAC in WebM spec for encrypted content.
xhwang's CL http://codereview.chromium.org/10918276 has been merged into this one. 10918276 CL updates the CDM interface, ClearKeyCdm, CdmWrapper and PPAPI code to reflect this change.
- Remove checksum from DecryptConfig.
- Remove HMAC from AesDecryptor.
- Update AesDecryptorTest as all decrypts will not fail but the
data checks will.
- Remove FakeCheckSum from ffmpeg_video_decoder_unittest.
- Remove HMAC from WebMClusterParser.
- Remove checksum from ppapi_plugin_instance.
BUG=150014
TEST=All media_unittests pass.
TBR=dmichael
Review URL: https://chromiumcodereview.appspot.com/10917308
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/mp4')
| -rw-r--r-- | media/mp4/mp4_stream_parser.cc | 1 | ||||
| -rw-r--r-- | media/mp4/track_run_iterator.cc | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/media/mp4/mp4_stream_parser.cc b/media/mp4/mp4_stream_parser.cc index b8f6331..2f51321 100644 --- a/media/mp4/mp4_stream_parser.cc +++ b/media/mp4/mp4_stream_parser.cc @@ -414,7 +414,6 @@ bool MP4StreamParser::EnqueueSample(BufferQueue* audio_buffers, decrypt_config.reset(new DecryptConfig( decrypt_config->key_id(), decrypt_config->iv(), - decrypt_config->checksum(), decrypt_config->data_offset(), subsamples)); } diff --git a/media/mp4/track_run_iterator.cc b/media/mp4/track_run_iterator.cc index 073eeee..36ec206 100644 --- a/media/mp4/track_run_iterator.cc +++ b/media/mp4/track_run_iterator.cc @@ -439,7 +439,6 @@ scoped_ptr<DecryptConfig> TrackRunIterator::GetDecryptConfig() { std::string(reinterpret_cast<const char*>(&kid[0]), kid.size()), std::string(reinterpret_cast<const char*>(cenc_info.iv), arraysize(cenc_info.iv)), - std::string(), // No checksum in MP4 using CENC. 0, // No offset to start of media data in MP4 using CENC. cenc_info.subsamples)); } |