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

Unified Diff: media/base/decrypt_config.cc

Issue 10823110: Add support for v0.3 of the encrypted WebM specification. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed the Check value. 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
Index: media/base/decrypt_config.cc
diff --git a/media/base/decrypt_config.cc b/media/base/decrypt_config.cc
index c499c92d66565d6e7f4b130df72adcf2eb4500db..0d2960bce757514dd91b3f41c27ee6f44760dbb5 100644
--- a/media/base/decrypt_config.cc
+++ b/media/base/decrypt_config.cc
@@ -19,7 +19,9 @@ DecryptConfig::DecryptConfig(const std::string& key_id,
data_offset_(data_offset),
subsamples_(subsamples) {
CHECK_GT(key_id.size(), 0u);
- CHECK_EQ(iv.size(), static_cast<size_t>(DecryptConfig::kDecryptionKeySize));
+ CHECK_EQ(
+ iv.size() == static_cast<size_t>(DecryptConfig::kDecryptionKeySize) ||
+ iv.empty(), true);
xhwang 2012/08/01 00:45:41 CHECK(iv.empty() || iv.size() == static_cast<size_
fgalligan1 2012/08/01 01:36:10 Done.
CHECK_GE(data_offset, 0);
}

Powered by Google App Engine
This is Rietveld 408576698