widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert Widevine 6.0.0 -> 4.5.0 libraries

Browse Source 
Includes Widevine libraries Version 4.5.0.7809

Also fixed samplePlayer's MediaCodec mode not running and
WVDrmInfoRequestStatusKey returning incorrect value.

Change-Id: Ibcc6d313790670a908ada93be80d6bf55a67b4ed
related-to-bug: 6929628
related-to-bug: 6833718
related-to-bug: 6889322
This commit is contained in:
Edwin Wong
2012-07-23 17:40:57 -07:00
parent 735ec731f2
commit e9f5431e78
33 changed files with 360 additions and 1082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
proprietary/samplePlayer/src/com/widevine/demo/MediaCodecView.java
View File

@@ -207,6 +207,7 @@ class CodecState {
} catch (MediaCodec.CryptoException e) {
Log.d(TAG, "CryptoException w/ errorCode "
+ e.getErrorCode() + ", '" + e.getMessage() + "'");
return false;
}
return true;
@@ -527,6 +528,8 @@ class MediaCodecView extends SurfaceView
if (isAudio) {
mAudioTrackState = state;
}
// set video view size
invalidate();
}
public void start() {
@@ -722,4 +725,14 @@ class MediaCodecView extends SurfaceView
}
return false;
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
int width = 720;
int height = 480;
Log.d(TAG, "setting size: " + width + 'x' + height);
setMeasuredDimension(width, height);
}
}

6
proprietary/samplePlayer/src/com/widevine/demo/WidevineDrm.java
View File

@@ -30,6 +30,7 @@ public class WidevineDrm {
private WidevineDrmLogEventListener logEventListener;
private final static long DEVICE_IS_PROVISIONED = 0;
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;
public StringBuffer logBuffer = new StringBuffer();
@@ -129,7 +130,10 @@ public class WidevineDrm {
}
public boolean isProvisionedDevice() {
return (mWVDrmInfoRequestStatusKey == DEVICE_IS_PROVISIONED);
logMessage("mWVDrmInfoRequestStatusKey = " + mWVDrmInfoRequestStatusKey + "\n");
return ((mWVDrmInfoRequestStatusKey == DEVICE_IS_PROVISIONED) ||
(mWVDrmInfoRequestStatusKey == DEVICE_IS_PROVISIONED_SD_ONLY));
}
public void registerPortal(String portal) {