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

Fix incorrect error returns from DRM plugin

Browse Source 
Includes Widevine library release 4.5.0.4946

Bug 5223230

Change-Id: Ie68d3a821c22b3b0b9b720560fee6768838f1a08
This commit is contained in:
Jeffrey Tinker
2011-10-17 21:48:16 -07:00
parent bcfe38dcb0
commit 8cecb914c3
8 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp
View File

@@ -854,10 +854,18 @@ status_t WVMDrmPlugin::onDecrypt(int uniqueId, DecryptHandle* decryptHandle, int
(*decBuffer)->length = encBuffer->length;
if (!mDrmPluginImpl->Operate(encBuffer->data, (*decBuffer)->data, encBuffer->length, iv)) {
int status;
status = mDrmPluginImpl->Operate(encBuffer->data, (*decBuffer)->data, encBuffer->length, iv);
if (status != WVDRMPluginAPI::RIGHTS_VALID) {
(*decBuffer)->length = 0;
usleep(1000000); // prevent spinning
return DRM_ERROR_LICENSE_EXPIRED;
if (status == WVDRMPluginAPI::RIGHTS_NOT_ACQUIRED) {
return DRM_ERROR_NO_LICENSE;
} else if (status == WVDRMPluginAPI::RIGHTS_EXPIRED) {
return DRM_ERROR_LICENSE_EXPIRED;
} else if (status == WVDRMPluginAPI::RIGHTS_INVALID) {
return DRM_ERROR_DECRYPT;
}
}
return DRM_NO_ERROR;