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

Unified Diff: android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.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: android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
index 7044cb77fcc33939376c1661c605b2b4b4902c38..15c5edbb9acb73861ac9ce164b2f746478fe77f8 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
@@ -5,13 +5,16 @@
package org.chromium.android_webview;
import android.content.Context;
+import android.util.Log;
import org.chromium.base.PathUtils;
import org.chromium.base.ThreadUtils;
import org.chromium.base.library_loader.LibraryLoader;
import org.chromium.base.library_loader.ProcessInitException;
import org.chromium.content.browser.BrowserStartupController;
+import org.chromium.media.MediaDrmBridge;
+import java.util.UUID;
/**
* Wrapper for the steps needed to initialize the java and native sides of webview chromium.
@@ -50,10 +53,25 @@ public abstract class AwBrowserProcess {
try {
BrowserStartupController.get(context).startBrowserProcessesSync(
BrowserStartupController.MAX_RENDERERS_SINGLE_PROCESS);
+ initializePlatformKeySystem();
} catch (ProcessInitException e) {
throw new RuntimeException("Cannot initialize WebView", e);
}
}
});
}
+
+ private static void initializePlatformKeySystem() {
+ String[] mappings = AwResource.getConfigKeySystemUuidMapping();
+ for (String mapping : mappings) {
+ try {
+ String fragments[] = mapping.split(",");
+ String keySystem = fragments[0].trim();
+ UUID uuid = UUID.fromString(fragments[1]);
+ MediaDrmBridge.addKeySystemUuidMapping(keySystem, uuid);
+ } catch (java.lang.RuntimeException e) {
+ Log.e(TAG, "Can't parse key-system mapping: " + mapping);
+ }
+ }
+ }
}

Powered by Google App Engine
This is Rietveld 408576698