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

Unified Diff: media/base/key_systems.cc

Issue 1014733002: Implement support for "keyids" Initialization Data format (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « media/base/eme_constants.h ('k') | media/base/key_systems_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/key_systems.cc
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
index db12a13919196536d6de8b0dc1ff7ca7deea26ed..92bcc38e880877486041d13bbb06c98110eff08d 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -39,8 +39,9 @@ struct NamedInitDataType {
static NamedInitDataType kInitDataTypeNames[] = {
{"webm", EME_INIT_DATA_TYPE_WEBM},
#if defined(USE_PROPRIETARY_CODECS)
- {"cenc", EME_INIT_DATA_TYPE_CENC}
+ {"cenc", EME_INIT_DATA_TYPE_CENC},
#endif // defined(USE_PROPRIETARY_CODECS)
+ {"keyids", EME_INIT_DATA_TYPE_KEYIDS},
};
struct NamedCodec {
@@ -83,7 +84,8 @@ static void AddClearKey(std::vector<KeySystemInfo>* concrete_key_systems) {
// http://developer.android.com/guide/appendix/media-formats.html
// VP9 support is device dependent.
- info.supported_init_data_types = EME_INIT_DATA_TYPE_WEBM;
+ info.supported_init_data_types =
+ EME_INIT_DATA_TYPE_WEBM | EME_INIT_DATA_TYPE_KEYIDS;
info.supported_codecs = EME_CODEC_WEBM_ALL;
#if defined(OS_ANDROID)
« no previous file with comments | « media/base/eme_constants.h ('k') | media/base/key_systems_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698