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

DO NOT MERGE Move legacy widevine classic global lock from framework to vendor/widevine implementation.

Browse Source 
am: eb9ea09db6

Change-Id: I5180b05591fe9bd96b0a7fea8dbddc3c601ee033
This commit is contained in:
Jeff Tinker
2017-01-09 16:10:47 +00:00
committed by android-build-merger
parent 8309a406b3 eb9ea09db6
commit 73cb652308
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
proprietary/wvm/WVMExtractorImpl.cpp
View File

@@ -26,6 +26,7 @@ using namespace android;
static sp<DecryptHandle> sDecryptHandle; static sp<DecryptHandle> sDecryptHandle;
static DrmManagerClient *sDrmManagerClient; static DrmManagerClient *sDrmManagerClient;
static Mutex gWVMutex;
static void _cb1(char *data, unsigned long size) static void _cb1(char *data, unsigned long size)
{ {
@@ -88,6 +89,8 @@ bool IsWidevineMedia(const sp<DataSource>& dataSource) {
ALOGV("IsWidevineMedia - insufficient data: %d", (int)bytesRead); ALOGV("IsWidevineMedia - insufficient data: %d", (int)bytesRead);
} else { } else {
setenv("WV_SILENT", "true", 1); setenv("WV_SILENT", "true", 1);
Mutex::Autolock autoLock(gWVMutex);
result = WV_IsWidevineMedia(buffer, kSniffSize); result = WV_IsWidevineMedia(buffer, kSniffSize);
} }
delete[] buffer; delete[] buffer;
@@ -110,6 +113,8 @@ WVMExtractorImpl::WVMExtractorImpl(sp<DataSource> dataSource)
mError(OK), mError(OK),
mSetupStatus(OK) mSetupStatus(OK)
{ {
Mutex::Autolock autoLock(gWVMutex);
dataSource->getDrmInfo(sDecryptHandle, &sDrmManagerClient); dataSource->getDrmInfo(sDecryptHandle, &sDrmManagerClient);
//ALOGD("WVMExtractorImpl::WVMExtractorImpl: uniqueId = %d", sDrmManagerClient->mUniqueId); //ALOGD("WVMExtractorImpl::WVMExtractorImpl: uniqueId = %d", sDrmManagerClient->mUniqueId);