Index: media/base/decrypt_config.cc |
diff --git a/media/base/decrypt_config.cc b/media/base/decrypt_config.cc |
index fb502df1c8ecefc7368301b66c8992eb72d5ced8..c499c92d66565d6e7f4b130df72adcf2eb4500db 100644 |
--- a/media/base/decrypt_config.cc |
+++ b/media/base/decrypt_config.cc |
@@ -8,25 +8,19 @@ |
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) { |
- CHECK_GT(key_id_size, 0); |
- CHECK_EQ(iv_size, DecryptConfig::kDecryptionKeySize); |
- CHECK_GE(checksum_size, 0); |
- CHECK_GE(encrypted_frame_offset, 0); |
- 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(const std::string& key_id, |
+ const std::string& iv, |
+ const std::string& checksum, |
+ const int data_offset, |
+ const std::vector<SubsampleEntry>& subsamples) |
+ : key_id_(key_id), |
+ iv_(iv), |
+ checksum_(checksum), |
+ data_offset_(data_offset), |
+ subsamples_(subsamples) { |
+ CHECK_GT(key_id.size(), 0u); |
+ CHECK_EQ(iv.size(), static_cast<size_t>(DecryptConfig::kDecryptionKeySize)); |
+ CHECK_GE(data_offset, 0); |
} |
DecryptConfig::~DecryptConfig() {} |