diff options
| author | fgalligan@chromium.org <fgalligan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 18:29:39 +0000 |
|---|---|---|
| committer | fgalligan@chromium.org <fgalligan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 18:29:39 +0000 |
| commit | c80cc522094a835d11cc6975a72dfc96eb113293 (patch) | |
| tree | be8e99f563f44eac8bb078f66346acd82c9af410 /media/base/decrypt_config.cc | |
| parent | 7436acd304fa1d500756562f54299b2601240f41 (diff) | |
| download | chromium_src-c80cc522094a835d11cc6975a72dfc96eb113293.zip chromium_src-c80cc522094a835d11cc6975a72dfc96eb113293.tar.gz chromium_src-c80cc522094a835d11cc6975a72dfc96eb113293.tar.bz2 | |
Add support for v0.3 of the encrypted WebM specification.
- 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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149449 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, 2 insertions, 1 deletions
diff --git a/media/base/decrypt_config.cc b/media/base/decrypt_config.cc index c499c92..3142751 100644 --- a/media/base/decrypt_config.cc +++ b/media/base/decrypt_config.cc @@ -19,7 +19,8 @@ DecryptConfig::DecryptConfig(const std::string& key_id, data_offset_(data_offset), subsamples_(subsamples) { CHECK_GT(key_id.size(), 0u); - CHECK_EQ(iv.size(), static_cast<size_t>(DecryptConfig::kDecryptionKeySize)); + CHECK(iv.size() == static_cast<size_t>(DecryptConfig::kDecryptionKeySize) || + iv.empty()); CHECK_GE(data_offset, 0); } |