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

Unified Diff: media/base/android/media_drm_bridge.cc

Issue 1128143005: MediaDrmBridge: Update ConvertInitDataType(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@init_data
Patch Set: comments addressed Created 5 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_drm_bridge.cc
diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_drm_bridge.cc
index fcb446b28b21255ee0bea4dbccd99b5deb7ce6a4..33e911eb545d81c0de31d6504b70e546a56b6826 100644
--- a/media/base/android/media_drm_bridge.cc
+++ b/media/base/android/media_drm_bridge.cc
@@ -56,16 +56,19 @@ const uint8 kWidevineUuid[16] = {
// Convert |init_data_type| to a string supported by MediaDRM.
// "audio"/"video" does not matter, so use "video".
std::string ConvertInitDataType(media::EmeInitDataType init_data_type) {
- // TODO(jrummell): API level >=20 supports "webm" and "cenc", so switch
- // to those strings.
+ // TODO(jrummell/xhwang): EME init data types like "webm" and "cenc" are
+ // supported in API level >=21 for Widevine key system. Switch to use those
+ // strings when they are officially supported in Android for all key systems.
switch (init_data_type) {
case media::EmeInitDataType::WEBM:
return "video/webm";
case media::EmeInitDataType::CENC:
return "video/mp4";
+ case media::EmeInitDataType::KEYIDS:
+ return "keyids";
default:
NOTREACHED();
- return "video/unknown";
+ return "unknown";
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698