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

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: rebase 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 d588b005f8627caf7c73d06dcabd6c394487fcaa..0b9bad782fa133b846f5501272043131123238de 100644
--- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
@@ -124,6 +124,12 @@ class MediaDrmBridge {
return createMediaCrypto();
}
+ @CalledByNative
+ private static boolean isCryptoSchemeSupported(byte[] schemeUUID, String containerMimeType) {
+ UUID cryptoScheme = getUUIDFromBytes(schemeUUID);
+ return MediaDrm.isCryptoSchemeSupported(cryptoScheme);
+ }
+
/**
* Create a new MediaDrmBridge from the crypto scheme UUID.
*
@@ -194,7 +200,7 @@ class MediaDrmBridge {
// NotProvisionedException happened during 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;
}
@@ -302,7 +308,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