diff options
| author | gunsch <gunsch@chromium.org> | 2015-04-20 09:28:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-20 16:29:08 +0000 |
| commit | ee935e25af1eefd0b786e6801bbec74e323638ab (patch) | |
| tree | 91f456103f6cfe20fb9828213cda9b45d3bad6f6 /chromecast | |
| parent | 80cb4aa26112660ad65459ee618a1eac9fd5676b (diff) | |
| download | chromium_src-ee935e25af1eefd0b786e6801bbec74e323638ab.zip chromium_src-ee935e25af1eefd0b786e6801bbec74e323638ab.tar.gz chromium_src-ee935e25af1eefd0b786e6801bbec74e323638ab.tar.bz2 | |
Chromecast: enables unprefixed EME on Cast Android.
R=lcwu@chromium.org
BUG=479136
Review URL: https://codereview.chromium.org/1090903003
Cr-Commit-Position: refs/heads/master@{#325857}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastBrowserHelper.java | 8 | ||||
| -rw-r--r-- | chromecast/browser/cast_browser_main_parts.cc | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastBrowserHelper.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastBrowserHelper.java index 2010e03..e9bbcc0 100644 --- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastBrowserHelper.java +++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastBrowserHelper.java @@ -19,6 +19,9 @@ import org.chromium.content.app.ContentApplication; import org.chromium.content.browser.BrowserStartupController; import org.chromium.content.browser.DeviceUtils; import org.chromium.content.common.ContentSwitches; +import org.chromium.media.MediaDrmBridge; + +import java.util.UUID; /** * Static, one-time initialization for the browser process. @@ -28,6 +31,10 @@ public class CastBrowserHelper { public static final String COMMAND_LINE_ARGS_KEY = "commandLineArgs"; + private static final String PLAYREADY_KEY_SYSTEM_NAME = "com.chromecast.playready"; + private static final UUID PLAYREADY_UUID = + UUID.fromString("9A04F079-9840-4286-AB92-E65BE0885F95"); + private static boolean sIsBrowserInitialized = false; /** @@ -69,6 +76,7 @@ public class CastBrowserHelper { BrowserStartupController.get(context, LibraryProcessType.PROCESS_BROWSER) .startBrowserProcessesSync(false); sIsBrowserInitialized = true; + MediaDrmBridge.addKeySystemUuidMapping(PLAYREADY_KEY_SYSTEM_NAME, PLAYREADY_UUID); return true; } catch (ProcessInitException e) { Log.e(TAG, "Unable to launch browser process.", e); diff --git a/chromecast/browser/cast_browser_main_parts.cc b/chromecast/browser/cast_browser_main_parts.cc index 3e623ee..45edf44 100644 --- a/chromecast/browser/cast_browser_main_parts.cc +++ b/chromecast/browser/cast_browser_main_parts.cc @@ -154,8 +154,6 @@ DefaultCommandLineSwitch g_default_switches[] = { { switches::kDisableInfobarForProtectedMediaIdentifier, ""}, { switches::kDisableGestureRequirementForMediaPlayback, ""}, #endif - // TODO(gunsch): Enable unprefixed EME on ATV. See http://crbug.com/471936. - { switches::kDisableEncryptedMedia, ""}, // Always enable HTMLMediaElement logs. { switches::kBlinkPlatformLogChannels, "Media"}, #if defined(DISABLE_DISPLAY) |