OEMCrypto v12 Haystack and Adapter
Merge of several CLs from the widevine repo. Merge from widevine repo of http://go/wvgerrit/22440 Build OEMCrypto v12 Haystacks with cache flush level3/mips/libwvlevel3.a Level3 Library 4465 Nov 29 2016 13:34:45 level3/arm/libwvlevel3.a Level3 Library 4445 Nov 29 2016 14:02:08 level3/x86/libwvlevel3.a Level3 Library 4464 Nov 29 2016 14:22:21 Merge from widevine repo of http://go/wvgerrit/22403 Pull cache flush out of Haystack Merge from widevine repo of http://go/wvgerrit/21145 OEMCrypto v12 stubs -- just the header file changes. Merge from widevine repo of http://go/wvgerrit/21146 Add OEMCrypto v12 functions to profiler This CL adds the new oemcrypto v12 functions for provision 3.0 to the list of profiler functions. Merge from widevine repo of http://go/wvgerrit/21143 OEMCrypto v12 adapter This CL updates the oemcrypto dynamic and static adpaters to include oemcrypto v12 funtionality. It adds the three new Provisioning 3.0 functions. It also adds code in the initialization routine to null out all of the function pointers if any of them fail to load. It is better to fall back to level 3 than to use an inconsistent level 1. b/31528025 Change-Id: I3579dc93e00ad7e7c743beecdd8291eac557d4e4
This commit is contained in:
@@ -87,7 +87,9 @@ typedef enum OEMCryptoResult {
|
||||
* 2. Place the decrypted data into protected memory (SecureBuffer). The
|
||||
* caller uses a platform-specific method to acquire the protected buffer
|
||||
* and a user-memory handle that references it. The handle is supplied
|
||||
* to the decrypt call in the descriptor.
|
||||
* to the decrypt call in the descriptor. If the buffer is filled with
|
||||
* several OEMCrypto calls, the same handle will be used, and the offset
|
||||
* will be incremented to indicate where the next write should take place.
|
||||
* 3. Place the decrypted data directly into the audio or video decoder fifo
|
||||
* (Direct). The caller will use platform-specific methods to initialize
|
||||
* the fifo and the decoders. The decrypted stream data is not accessible
|
||||
@@ -101,6 +103,7 @@ typedef enum OEMCryptoResult {
|
||||
* (type == OEMCrypto_BufferType_Secure)
|
||||
* buffer - handle to a platform-specific secure buffer.
|
||||
* max_length - Size of platform-specific secure buffer.
|
||||
* offset - offset from beginning of buffer to which OEMCrypto should write.
|
||||
* (type == OEMCrypto_BufferType_Direct)
|
||||
* is_video - If true, decrypted bytes are routed to the video
|
||||
* decoder. If false, decrypted bytes are routed to the
|
||||
|
||||
Reference in New Issue
Block a user