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

Unified Diff: media/webm/webm_content_encodings.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: Rebase to master 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
Index: media/webm/webm_content_encodings.h
diff --git a/media/webm/webm_content_encodings.h b/media/webm/webm_content_encodings.h
index 2947a263e121a86a7fd430b487b8fa0d1f65d926..ea903d8362f405e02b826e1e479c94a8e19ab919 100644
--- a/media/webm/webm_content_encodings.h
+++ b/media/webm/webm_content_encodings.h
@@ -42,6 +42,11 @@ class MEDIA_EXPORT ContentEncoding {
kEncAlgoAes = 5,
};
+ enum CipherMode {
+ kCipherModeInvalid = 0,
+ kCipherModeCtr = 1,
+ };
+
ContentEncoding();
~ContentEncoding();
@@ -64,6 +69,9 @@ class MEDIA_EXPORT ContentEncoding {
void SetEncryptionKeyId(const uint8* encryption_key_id, int size);
+ CipherMode cipher_mode() const { return cipher_mode_; }
+ void set_cipher_mode(CipherMode mode) { cipher_mode_ = mode; }
+
private:
int64 order_;
Scope scope_;
@@ -71,6 +79,7 @@ class MEDIA_EXPORT ContentEncoding {
EncryptionAlgo encryption_algo_;
scoped_array<uint8> encryption_key_id_;
int encryption_key_id_size_;
+ CipherMode cipher_mode_;
DISALLOW_COPY_AND_ASSIGN(ContentEncoding);
};

Powered by Google App Engine
This is Rietveld 408576698