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

Unified Diff: media/base/media_util.h

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed a couple comments Created 4 years, 10 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/media_util.h
diff --git a/media/base/media_util.h b/media/base/media_util.h
index 4e53c9a0c0e611b4ea0c5b7ef5fb180308148f96..c7ddc8bb1ea2ec61f3f1906f0fb26cd110fd1cdc 100644
--- a/media/base/media_util.h
+++ b/media/base/media_util.h
@@ -8,6 +8,7 @@
#include <stdint.h>
#include <vector>
+#include "media/base/encryption_scheme.h"
#include "media/base/media_export.h"
namespace media {
@@ -16,6 +17,11 @@ namespace media {
// constructed with empty extra data.
MEDIA_EXPORT std::vector<uint8_t> EmptyExtraData();
+// The following helper functions return new instances of EncryptionScheme that
+// indicate widely used settings.
+MEDIA_EXPORT EncryptionScheme Unencrypted();
+MEDIA_EXPORT EncryptionScheme AesCtrEncryptionScheme();
+
} // namespace media
#endif // MEDIA_BASE_UTIL_H_

Powered by Google App Engine
This is Rietveld 408576698