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

Unified Diff: media/base/android/java/src/org/chromium/media/MediaDrmBridge.java

Issue 23517002: MediaSourcePlayer implements IsTypeSupported(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 7 years, 4 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/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.");

Powered by Google App Engine
This is Rietveld 408576698