Widevine library update 4.5.0.7251 DO NOT MERGE

Resolves timeout issues on CDN redirect delays.
Includes the client side changes to support SD-only
playback on unlocked/rooted L2/L3 devices.

Change-Id: Id962e08b67e4d29bd22d254a4967c71891b504c9
related-to-bug: 6512768
related-to-bug: 6234558
This commit is contained in:
Jeff Tinker
2012-05-25 18:05:15 -07:00
parent 8b22e13988
commit 43b8f70836
6 changed files with 5 additions and 2 deletions

View File

@@ -31,7 +31,8 @@ class WVDRMPluginAPI {
// provisionedFlags // provisionedFlags
enum { enum {
DEVICE_IS_PROVISIONED, DEVICE_IS_PROVISIONED,
DEVICE_IS_NOT_PROVISIONED DEVICE_IS_NOT_PROVISIONED,
DEVICE_IS_PROVISIONED_SD_ONLY
}; };
static const int PlaybackMode_Default = 0; static const int PlaybackMode_Default = 0;

View File

@@ -30,6 +30,7 @@ public class WidevineDrm {
private WidevineDrmLogEventListener logEventListener; private WidevineDrmLogEventListener logEventListener;
private final static long DEVICE_IS_PROVISIONED = 0; private final static long DEVICE_IS_PROVISIONED = 0;
private final static long DEVICE_IS_NOT_PROVISIONED = 1; private final static long DEVICE_IS_NOT_PROVISIONED = 1;
private final static long DEVICE_IS_PROVISIONED_SD_ONLY = 2;
private long mWVDrmInfoRequestStatusKey = DEVICE_IS_PROVISIONED; private long mWVDrmInfoRequestStatusKey = DEVICE_IS_PROVISIONED;
public StringBuffer logBuffer = new StringBuffer(); public StringBuffer logBuffer = new StringBuffer();
@@ -129,7 +130,8 @@ public class WidevineDrm {
} }
public boolean isProvisionedDevice() { public boolean isProvisionedDevice() {
return (mWVDrmInfoRequestStatusKey == DEVICE_IS_PROVISIONED); return ((mWVDrmInfoRequestStatusKey == DEVICE_IS_PROVISIONED) ||
(mWVDrmInfoRequestStatusKey == DEVICE_IS_PROVISIONED_SD_ONLY));
} }
public void registerPortal(String portal) { public void registerPortal(String portal) {