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

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

Issue 333003003: aw: Support the platform specific key-systems. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added 'media/base/android/java' into android_webview/java/DEPS. Created 6 years, 6 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 aceb36279946165a2f766aa4c1144ae862831560..e890236105fe676a7636509726496eb4e51f8777 100644
--- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
@@ -22,6 +22,7 @@ import org.chromium.base.JNINamespace;
import java.io.IOException;
import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
import java.util.ArrayDeque;
import java.util.HashMap;
import java.util.UUID;
@@ -31,7 +32,7 @@ import java.util.UUID;
* sessions for a single MediaSourcePlayer.
*/
@JNINamespace("media")
-class MediaDrmBridge {
+public class MediaDrmBridge {
// Implementation Notes:
// - A media crypto session (mMediaCryptoSession) is opened after MediaDrm
// is created. This session will be added to mSessionIds.
@@ -876,6 +877,15 @@ class MediaDrmBridge {
}
}
+ public static void addKeySystemUuidMapping(String keySystem, UUID uuid) {
+ ByteBuffer uuidBuffer = ByteBuffer.allocateDirect(16);
+ // MSB (byte) should be positioned at the first element.
+ uuidBuffer.order(ByteOrder.BIG_ENDIAN);
+ uuidBuffer.putLong(uuid.getMostSignificantBits());
+ uuidBuffer.putLong(uuid.getLeastSignificantBits());
+ nativeAddKeySystemUuidMapping(keySystem, uuidBuffer);
+ }
+
private native void nativeOnMediaCryptoReady(long nativeMediaDrmBridge);
private native void nativeOnSessionCreated(long nativeMediaDrmBridge, int sessionId,
@@ -892,4 +902,6 @@ class MediaDrmBridge {
private native void nativeOnResetDeviceCredentialsCompleted(
long nativeMediaDrmBridge, boolean success);
+
+ private static native void nativeAddKeySystemUuidMapping(String keySystem, ByteBuffer uuid);
}

Powered by Google App Engine
This is Rietveld 408576698