diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 19:12:54 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 19:12:54 +0000 |
| commit | 672f667ed68e59ec0aaf5c40167e890673ef3f7c (patch) | |
| tree | c57d1749a75b5ce0268f637d63bdec7f8821230b /media/base/decrypt_config.cc | |
| parent | 359da1a97f59d417f84300b7254668920f9ca064 (diff) | |
| download | chromium_src-672f667ed68e59ec0aaf5c40167e890673ef3f7c.zip chromium_src-672f667ed68e59ec0aaf5c40167e890673ef3f7c.tar.gz chromium_src-672f667ed68e59ec0aaf5c40167e890673ef3f7c.tar.bz2 | |
Revert 149449 - Add support for v0.3 of the encrypted WebM specification.
Asan didn't like this: http://build.chromium.org/p/chromium.memory/builders/Linux%20ASAN%20Tests%20%282%29/builds/414/steps/media_unittests/logs/stdio
- Added code to handle the signal_byte contained within WebM
encrypted Blocks.
- Added a unittest to aes_decryptor to hanlde an encrypted WebM
Block with an unencrypted frame.
BUG=139876
TEST=Run media_unittests --gtest_filter=AesDecryptor* and all
tests must pass.
Review URL: https://chromiumcodereview.appspot.com/10823110
TBR=fgalligan@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10831115
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/decrypt_config.cc')
| -rw-r--r-- | media/base/decrypt_config.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/base/decrypt_config.cc b/media/base/decrypt_config.cc index 3142751..c499c92 100644 --- a/media/base/decrypt_config.cc +++ b/media/base/decrypt_config.cc @@ -19,8 +19,7 @@ DecryptConfig::DecryptConfig(const std::string& key_id, data_offset_(data_offset), subsamples_(subsamples) { CHECK_GT(key_id.size(), 0u); - CHECK(iv.size() == static_cast<size_t>(DecryptConfig::kDecryptionKeySize) || - iv.empty()); + CHECK_EQ(iv.size(), static_cast<size_t>(DecryptConfig::kDecryptionKeySize)); CHECK_GE(data_offset, 0); } |