Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Unified Diff: media/base/decrypt_config.cc

Issue 10807003: Revert 147169 - Add support for encrypted WebM files as defined in the RFC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/decrypt_config.h ('k') | media/crypto/aes_decryptor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/decrypt_config.cc
===================================================================
--- media/base/decrypt_config.cc (revision 147171)
+++ media/base/decrypt_config.cc (working copy)
@@ -8,25 +8,11 @@
namespace media {
-DecryptConfig::DecryptConfig(const uint8* key_id, int key_id_size,
- const uint8* iv, int iv_size,
- const uint8* checksum, int checksum_size,
- int encrypted_frame_offset)
- : key_id_(new uint8[key_id_size]),
- key_id_size_(key_id_size),
- iv_(new uint8[iv_size]),
- iv_size_(iv_size),
- checksum_(checksum_size > 0 ? new uint8[checksum_size] : NULL),
- checksum_size_(checksum_size),
- encrypted_frame_offset_(encrypted_frame_offset) {
+DecryptConfig::DecryptConfig(const uint8* key_id, int key_id_size)
+ : key_id_size_(key_id_size) {
CHECK_GT(key_id_size, 0);
- CHECK_EQ(iv_size, DecryptConfig::kDecryptionKeySize);
- CHECK_GE(checksum_size, 0);
- CHECK_GE(encrypted_frame_offset, 0);
+ key_id_.reset(new uint8[key_id_size]);
memcpy(key_id_.get(), key_id, key_id_size);
- memcpy(iv_.get(), iv, iv_size);
- if (checksum_size > 0)
- memcpy(checksum_.get(), checksum, checksum_size);
}
DecryptConfig::~DecryptConfig() {}
« no previous file with comments | « media/base/decrypt_config.h ('k') | media/crypto/aes_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698