Index: media/base/android/java/src/org/chromium/media/MediaDrmBridge.java |
diff --git a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java |
index 913e984e16dae9b25629a9ad24a75b0c057fe688..b47edf1c3f9bda2498336490748290651b77d7da 100644 |
--- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java |
+++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java |
@@ -88,6 +88,13 @@ class MediaDrmBridge { |
return session; |
} |
+ @CalledByNative |
+ private static boolean isCryptoSchemeSupported(byte[] schemeUUID, String containerMimeType) { |
+ UUID cryptoScheme = getUUIDFromBytes(schemeUUID); |
+ // TODO(xhwang): Test |containerMimeType| on latest image. |
+ return MediaDrm.isCryptoSchemeSupported(cryptoScheme/*, containerMimeType*/); |
+ } |
+ |
/** |
* Create a new MediaDrmBridge from the crypto scheme UUID. |
* |
@@ -167,7 +174,7 @@ class MediaDrmBridge { |
mSessionId = openSession(); |
if (mSessionId == null) { |
if (mPendingInitData != null) { |
- Log.e(TAG, "generateKeyRequest is called when another call is pending."); |
+ Log.e(TAG, "generateKeyRequest called when another call is pending."); |
onKeyError(); |
return; |
} |
@@ -273,7 +280,7 @@ class MediaDrmBridge { |
* @param response Response data from the provision server. |
*/ |
private void onProvisionResponse(byte[] response) { |
- Log.d(TAG, "provide key response."); |
+ Log.d(TAG, "onProvisionResponse()"); |
if (response == null || response.length == 0) { |
Log.e(TAG, "Invalid provision response."); |