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

Integration with moto secure keybox storage and add obfuscation of security-related symbols (3513413, 4083757). Also 3481645 - log spam and 3302187 - error handling

Browse Source 
Change-Id: Ic11ed7ad57717e88b6f0f2991d8bbb9e1251d546
This commit is contained in:
Jeffrey Tinker
2011-03-11 13:33:13 -08:00
parent 007788f060
commit 3a1e0f3768
15 changed files with 72 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
proprietary/wvm/WVMExtractorImpl.cpp
View File

@@ -36,16 +36,15 @@ static DecryptHandle *sDecryptHandle;
static DrmManagerClient *sDrmManagerClient;
// Android integration callout hooks
static void HandleEcmCallout(char *ecm, unsigned long size)
static void _cb1(char *data, unsigned long size)
{
DrmBuffer buf(ecm, size);
DrmBuffer buf(data, size);
if (sDrmManagerClient != NULL) {
sDrmManagerClient->initializeDecryptUnit(sDecryptHandle, 0, &buf);
}
}
static int HandleDecryptCallout(char *in, char *out, int length, char *iv)
static int _cb2(char *in, char *out, int length, char *iv)
{
int status = -1;
@@ -71,7 +70,6 @@ static int HandleDecryptCallout(char *in, char *out, int length, char *iv)
return status;
}
namespace android {
// DLL entry - construct an extractor and return it
@@ -88,10 +86,9 @@ WVMExtractorImpl::WVMExtractorImpl(sp<DataSource> dataSource)
{
dataSource->getDrmInfo(&sDecryptHandle, &sDrmManagerClient);
// Set up callouts
AndroidSetLogCallout(android_printbuf);
AndroidSetEcmCallout(HandleEcmCallout);
AndroidSetDecryptCallout(HandleDecryptCallout);
_ah006(android_printbuf);
_ah002(_cb1);
_ah004(_cb2);
if (sDecryptHandle != NULL) {
if (sDecryptHandle->status != RightsStatus::RIGHTS_VALID) {