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

Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long."

Browse Source 
We need to do this because with this patch, SHA/MD5 module may get stuck and cause power consumption regression.

This reverts commit 95d4dc7776.

related-to-bug: 5739618
This commit is contained in:
James Dong
2011-12-14 11:05:53 -08:00
parent c00a26a05f
commit 444dc2a845
3 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -710,14 +710,42 @@ status_t WVMDrmPlugin::onRemoveAllRights(int uniqueId) {
status_t WVMDrmPlugin::onOpenDecryptSession(
int uniqueId, DecryptHandle *decryptHandle, int fd, off64_t offset, off64_t length)
{
// For efficiency, we rely on the WVMExtractor's sniff result instead of
// setting mimeType and decryptApiType here for the DRMExtractor's sniff.
// WVMExtractor's sniff uses the cached data source for the sniff.
decryptHandle->decryptInfo = NULL;
decryptHandle->status = DRM_NO_ERROR;
status_t result = DRM_ERROR_CANNOT_HANDLE;
mDrmPluginImpl->OpenSession(NULL);
return DRM_NO_ERROR;
//LOGD("onOpenDecryptSession: fd=%d, offset=%lld, length=%lld", fd, offset, length);
char buffer[64 * 1024];
int dupfd = dup(fd);
if (dupfd == -1)
return result;
FILE *f = fdopen(dupfd, "rb");
if (f) {
fseek(f, 0, SEEK_SET);
if (fread(buffer, 1, sizeof(buffer), f) != sizeof(buffer)) {
fclose(f);
return DRM_ERROR_CANNOT_HANDLE;
}
fclose(f);
} else {
close(dupfd);
return result;
}
if (WV_IsWidevineMedia(buffer, sizeof(buffer))) {
//LOGD("WVMDrmPlugin::onOpenDecryptSession - WV_IsWidevineMedia: true");
decryptHandle->mimeType = String8("video/wvm");
decryptHandle->decryptApiType = DecryptApiType::WV_BASED;
decryptHandle->status = DRM_NO_ERROR;
decryptHandle->decryptInfo = NULL;
mDrmPluginImpl->OpenSession(NULL);
result = DRM_NO_ERROR;
} else {
//LOGD("WVMDrmPlugin::onOpenDecryptSession - not Widevine media");
}
return result;
}
/**
@@ -732,19 +760,21 @@ status_t WVMDrmPlugin::onOpenDecryptSession(
status_t WVMDrmPlugin::onOpenDecryptSession(
int uniqueId, DecryptHandle* decryptHandle, const char* uri)
{
// For efficiency, we rely on the WVMExtractor's sniff result instead of
// setting mimeType and decryptApiType here for the DRMExtractor's sniff.
// WVMExtractor's sniff uses the cached data source for the sniff.
status_t result = DRM_ERROR_CANNOT_HANDLE;
if (!uri)
return result;
decryptHandle->decryptInfo = NULL;
decryptHandle->status = DRM_NO_ERROR;
if (mDrmPluginImpl->IsSupportedMediaType(uri)) {
//LOGD("WVMDrmPlugin::onOpenDecryptSession(uri) : %d - match", uniqueId);
decryptHandle->mimeType = String8("video/wvm");
decryptHandle->decryptApiType = DecryptApiType::WV_BASED;
decryptHandle->status = DRM_NO_ERROR;
decryptHandle->decryptInfo = NULL;
if (mDrmPluginImpl->OpenSession(uri)) {
result = DRM_NO_ERROR;
if (mDrmPluginImpl->OpenSession(uri)) {
result = DRM_NO_ERROR;
}
} else {
//LOGD("WVMDrmPlugin::onOpenDecryptSession(uri) - not Widevine media");
}