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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/media_util.cc

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more xhwang comments Created 4 years, 9 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
« media/base/fake_demuxer_stream.cc ('K') | « media/base/media_util.h ('k') | media/base/test_helpers.cc » ('j') | media/base/test_helpers.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/media_util.cc
diff --git a/media/base/media_util.cc b/media/base/media_util.cc
index bd7929f56099685cbb466760695f7a3454acb4ff..a6516cd23058a1795f144fa23b1e57c6cc5c270a 100644
--- a/media/base/media_util.cc
+++ b/media/base/media_util.cc
@@ -10,4 +10,13 @@ std::vector<uint8_t> EmptyExtraData() {
return std::vector<uint8_t>();
}
+EncryptionScheme Unencrypted() {
+ return EncryptionScheme();
+}
+
+EncryptionScheme AesCtrEncryptionScheme() {
+ return EncryptionScheme(EncryptionScheme::CIPHER_MODE_AES_CTR,
+ EncryptionScheme::Pattern());
xhwang 2016/03/07 18:39:52 nit: EncryptionScheme(EncryptionScheme::CIPHER_MOD
dougsteed 2016/03/07 21:12:40 Done.
+}
+
} // namespace media
« media/base/fake_demuxer_stream.cc ('K') | « media/base/media_util.h ('k') | media/base/test_helpers.cc » ('j') | media/base/test_helpers.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698