diff options
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/decrypt_config.cc | 3 | ||||
| -rw-r--r-- | media/base/decrypt_config.h | 4 |
2 files changed, 2 insertions, 5 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); } diff --git a/media/base/decrypt_config.h b/media/base/decrypt_config.h index 669aa36..d8ad224 100644 --- a/media/base/decrypt_config.h +++ b/media/base/decrypt_config.h @@ -36,9 +36,7 @@ class MEDIA_EXPORT DecryptConfig { // |key_id| is the ID that references the decryption key for this sample. // |iv| is the initialization vector defined by the encrypted format. - // Currently |iv| must be 16 bytes as defined by WebM and ISO. Or must be - // empty which signals to perform the integrity check on an unencrypted - // frame as defined WebM. + // Currently |iv_size| must be 16 bytes as defined by WebM and ISO. // |checksum| is the hash value of the encrypted buffer. |checksum| is // defined by the encrypted format and may be NULL. // |data_offset| is the amount of data that should be discarded from the |