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

Unified Diff: media/webm/webm_content_encodings.h

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/webm/webm_constants.h ('k') | media/webm/webm_content_encodings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/webm/webm_content_encodings.h
===================================================================
--- media/webm/webm_content_encodings.h (revision 147171)
+++ media/webm/webm_content_encodings.h (working copy)
@@ -42,11 +42,6 @@
kEncAlgoAes = 5,
};
- enum CipherMode {
- kCipherModeInvalid = 0,
- kCipherModeCtr = 1,
- };
-
ContentEncoding();
~ContentEncoding();
@@ -69,9 +64,6 @@
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_;
@@ -79,7 +71,6 @@
EncryptionAlgo encryption_algo_;
scoped_array<uint8> encryption_key_id_;
int encryption_key_id_size_;
- CipherMode cipher_mode_;
DISALLOW_COPY_AND_ASSIGN(ContentEncoding);
};
« no previous file with comments | « media/webm/webm_constants.h ('k') | media/webm/webm_content_encodings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698