resolved conflicts for merge of 65a35c7d to klp-dev

Change-Id: If8f3ff6b3f638038da57fde85edee982f7ef8144
This commit is contained in:
Jeff Tinker
2014-04-04 15:48:47 -07:00
2 changed files with 17 additions and 6 deletions

View File

@@ -1,12 +1,22 @@
ExoPlayerDemo.apk can be used to do end-to-end verification of your Modular DRM.
ExoPlayerDemo.apk can be used to do end-to-end verification of Modular DRM.
To install, side load ExoPlayerDemo.apk app to your device:
adb install ExoPlayerDemo.apk
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).
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)
Notes:
@@ -24,5 +34,6 @@ 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.
- The apk is still built against API level 18. The features above are accessed via reflection.
- 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.