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

Unified Diff: media/base/encryption_scheme.cc

Issue 2058113002: Add 'cbcs' encryption scheme support in Android media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years 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/base/encryption_scheme.cc
diff --git a/media/base/encryption_scheme.cc b/media/base/encryption_scheme.cc
index 70d133c65ab4612fc69d020aa7c3a5de5023acc5..dea08ed5d51ca8f7291299544f11135d8ff5b2be 100644
--- a/media/base/encryption_scheme.cc
+++ b/media/base/encryption_scheme.cc
@@ -14,6 +14,14 @@ EncryptionScheme::Pattern::Pattern(uint32_t encrypt_blocks,
EncryptionScheme::Pattern::~Pattern() {}
+uint32_t EncryptionScheme::Pattern::encrypt_blocks() const {
+ return encrypt_blocks_;
+}
+
+uint32_t EncryptionScheme::Pattern::skip_blocks() const {
+ return skip_blocks_;
+}
+
bool EncryptionScheme::Pattern::Matches(const Pattern& other) const {
return encrypt_blocks_ == other.encrypt_blocks() &&
skip_blocks_ == other.skip_blocks();
@@ -30,6 +38,18 @@ EncryptionScheme::EncryptionScheme(CipherMode mode, const Pattern& pattern)
EncryptionScheme::~EncryptionScheme() {}
+bool EncryptionScheme::is_encrypted() const {
+ return mode_ != CIPHER_MODE_UNENCRYPTED;
+}
+
+EncryptionScheme::CipherMode EncryptionScheme::mode() const {
+ return mode_;
+}
+
+const EncryptionScheme::Pattern& EncryptionScheme::pattern() const {
+ return pattern_;
+}
+
bool EncryptionScheme::Matches(const EncryptionScheme& other) const {
return mode_ == other.mode_ && pattern_.Matches(other.pattern_);
}

Powered by Google App Engine
This is Rietveld 408576698