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

Unified Diff: media/base/decrypt_config.h

Issue 10535029: Add support for encrypted WebM files as defined in the RFC. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 6 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 | « no previous file | media/base/decrypt_config.cc » ('j') | media/webm/webm_cluster_parser.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/decrypt_config.h
diff --git a/media/base/decrypt_config.h b/media/base/decrypt_config.h
index 5fca7876d330c78c76ade6c624ba00b85b49c70c..15e72da69ab9567da7bf5b076f7d444665234dd2 100644
--- a/media/base/decrypt_config.h
+++ b/media/base/decrypt_config.h
@@ -14,13 +14,23 @@ namespace media {
// Contains all information that a decryptor needs to decrypt.
class MEDIA_EXPORT DecryptConfig {
public:
- explicit DecryptConfig(const uint8* key_id, int key_id_size);
+ DecryptConfig(const uint8* hmac, int hmac_size,
+ uint64 iv,
+ const uint8* key_id, int key_id_size);
~DecryptConfig();
+ const uint8* hmac() const { return hmac_.get(); }
+ int hmac_size() const { return hmac_size_; }
+ uint64 iv() const { return iv_; }
const uint8* key_id() const { return key_id_.get(); }
int key_id_size() const { return key_id_size_; }
private:
+ scoped_array<uint8> hmac_;
+ int hmac_size_;
+
+ uint64 iv_;
+
scoped_array<uint8> key_id_;
int key_id_size_;
« no previous file with comments | « no previous file | media/base/decrypt_config.cc » ('j') | media/webm/webm_cluster_parser.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698