Merge "Merge Changes from CDM repository"

This commit is contained in:
Fred Gylys-Colwell
2014-07-01 20:05:29 +00:00
committed by Android (Google) Code Review
66 changed files with 2927 additions and 1998 deletions

View File

@@ -1,22 +1,12 @@
ExoPlayerDemo.apk can be used to do end-to-end verification of Modular DRM.
ExoPlayerDemo.apk can be used to do end-to-end verification of your Modular DRM.
To install, side load ExoPlayerDemo.apk app to your device:
adb install ExoPlayerDemo.apk
To run, launch ExoPlayer, then choose the clip to play. The
Widevine-encrypted DASH CENC assets are in the "WIDEVINE DASH GTS"
section.
These assets test various configurations of the Key Control Block (KCB)
with various protections and expirations:
WV: HDCP not specified (KCB: Observe_HDCP=false)
WV: HDCP not required (KCB: Observe_HDCP=true && HDCP=not required && DataPath=normal)
WV: HDCP required (KCB: Observe_HDCP=true && HDCP=required && DataPath=normal)
WV: Secure video path required (KCB: Observe_HDCP=true && HDCP=not required && DataPath=secure)
WV: HDCP + secure video path required (KCB: Observe_HDCP=true && HDCP=required && DataPath=secure)
WV: 30s license duration (KCB: test timer expiration)
To run, launch ExoPlayer, then choose the Revenge (DASH CENC) clip, which is encrypted
using DASH Common Encryption. Then press "Play" to start playback. The other clips
in the list are clear (i.e. not encrypted).
Notes:
@@ -34,6 +24,5 @@ Notes:
AudioTrack.getTimestamp API to do A/V sync. It will fall back to how it used to do things if
the API isn't available.
- Exoplayer will retrieve a new license when playing "WV: 30s license duration",
after the license duration has expired. Integrators should verify by means
other than visual inspection that license duration is being enforced.
- The apk is still built against API level 18. The features above are accessed via reflection.

View File

@@ -14,6 +14,13 @@ needs a different format of build script, and it needs to build against the OS'
modified version of gTest, rather than the packaged version.
Local Modifications:
--Tue Jun 3, 2014 (joeyparrish)--
Removed DOS newlines for the sake of the git-to-piper bridge. Piper converts
newlines automatically to unix style. If this change is not made in git, the
bridge detects differences and attempts to sync to piper, even when nothing
has changed in git.
--Mon Feb 4, 2014 (juce)--
Upgraded to gMock 1.7.0. This is required for compatibility with the upgrade
@@ -59,4 +66,4 @@ Excluded the following files from being copied to Android repo:
make/
msvc/
fused-src/
gtest/
gtest/