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

Unified Diff: media/base/decrypt_config.cc

Issue 1422643002: Pass DecryptConfig parameters over IPC and use it in AVDA. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase only Created 5 years, 2 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 7df9216ed98975b9525282994b6aa9c030689249..0c00efe1a2360e01cf4e6daa0bef611bd35479e5 100644
--- a/media/base/decrypt_config.cc
+++ b/media/base/decrypt_config.cc
@@ -4,7 +4,9 @@
#include "media/base/decrypt_config.h"
+#include <iomanip>
watk 2015/10/22 22:49:26 Newline after this
dcheng 2015/10/23 00:44:47 What is this for?
Tima Vaisburd 2015/10/23 18:51:41 Missed during prior cleanup, removed.
#include "base/logging.h"
+#include "base/strings/string_number_conversions.h"
namespace media {
@@ -37,4 +39,17 @@ bool DecryptConfig::Matches(const DecryptConfig& config) const {
return true;
}
+std::ostream& DecryptConfig::Print(std::ostream& os) const {
+ os << "key_id:'" << base::HexEncode(key_id_.data(), key_id_.size()) << "'"
+ << " iv:'" << base::HexEncode(iv_.data(), iv_.size()) << "'";
+
+ os << " subsamples:[";
+ for (SubsampleEntry entry : subsamples_) {
dcheng 2015/10/23 00:44:47 This copies entry. const SubsampleEntry&
Tima Vaisburd 2015/10/23 18:51:41 Done.
+ os << "(clear:" << entry.clear_bytes << ", cypher:" << entry.cypher_bytes
+ << ")";
+ }
+ os << "]";
+ return os;
+}
+
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698