LineageOS/android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for merge of c761a80d to master

Browse Source 
Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
This commit is contained in:
Gloria Wang
2011-03-14 11:56:39 -07:00
parent 8b9a906751 6cfa41f06f
commit 1825ce2475
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drm/drmserver/DrmManager.cpp
View File

@@ -119,7 +119,7 @@ status_t DrmManager::unloadPlugIns() {
status_t DrmManager::setDrmServiceListener( status_t DrmManager::setDrmServiceListener(
int uniqueId, const sp<IDrmServiceListener>& drmServiceListener) { int uniqueId, const sp<IDrmServiceListener>& drmServiceListener) {
Mutex::Autolock _l(mLock); Mutex::Autolock _l(mListenerLock);
if (NULL != drmServiceListener.get()) { if (NULL != drmServiceListener.get()) {
mServiceListeners.add(uniqueId, drmServiceListener); mServiceListeners.add(uniqueId, drmServiceListener);
} else { } else {
@@ -573,7 +573,7 @@ String8 DrmManager::getSupportedPlugInIdFromPath(int uniqueId, const String8& pa
} }
void DrmManager::onInfo(const DrmInfoEvent& event) { void DrmManager::onInfo(const DrmInfoEvent& event) {
Mutex::Autolock _l(mLock); Mutex::Autolock _l(mListenerLock);
for (unsigned int index = 0; index < mServiceListeners.size(); index++) { for (unsigned int index = 0; index < mServiceListeners.size(); index++) {
int uniqueId = mServiceListeners.keyAt(index); int uniqueId = mServiceListeners.keyAt(index);

5
drm/libdrmframework/DrmManagerClient.cpp
View File

@@ -79,7 +79,6 @@ int DrmManagerClient::checkRightsStatus(const String8& path, int action) {
status_t DrmManagerClient::consumeRights( status_t DrmManagerClient::consumeRights(
sp<DecryptHandle> &decryptHandle, int action, bool reserve) { sp<DecryptHandle> &decryptHandle, int action, bool reserve) {
Mutex::Autolock _l(mDecryptLock);
return mDrmManagerClientImpl->consumeRights(mUniqueId, decryptHandle, action, reserve); return mDrmManagerClientImpl->consumeRights(mUniqueId, decryptHandle, action, reserve);
} }
@@ -132,7 +131,6 @@ status_t DrmManagerClient::closeDecryptSession(sp<DecryptHandle> &decryptHandle)
status_t DrmManagerClient::initializeDecryptUnit( status_t DrmManagerClient::initializeDecryptUnit(
sp<DecryptHandle> &decryptHandle, int decryptUnitId, const DrmBuffer* headerInfo) { sp<DecryptHandle> &decryptHandle, int decryptUnitId, const DrmBuffer* headerInfo) {
Mutex::Autolock _l(mDecryptLock);
return mDrmManagerClientImpl->initializeDecryptUnit( return mDrmManagerClientImpl->initializeDecryptUnit(
mUniqueId, decryptHandle, decryptUnitId, headerInfo); mUniqueId, decryptHandle, decryptUnitId, headerInfo);
} }
@@ -140,21 +138,18 @@ status_t DrmManagerClient::initializeDecryptUnit(
status_t DrmManagerClient::decrypt( status_t DrmManagerClient::decrypt(
sp<DecryptHandle> &decryptHandle, int decryptUnitId, sp<DecryptHandle> &decryptHandle, int decryptUnitId,
const DrmBuffer* encBuffer, DrmBuffer** decBuffer, DrmBuffer* IV) { const DrmBuffer* encBuffer, DrmBuffer** decBuffer, DrmBuffer* IV) {
Mutex::Autolock _l(mDecryptLock);
return mDrmManagerClientImpl->decrypt( return mDrmManagerClientImpl->decrypt(
mUniqueId, decryptHandle, decryptUnitId, encBuffer, decBuffer, IV); mUniqueId, decryptHandle, decryptUnitId, encBuffer, decBuffer, IV);
} }
status_t DrmManagerClient::finalizeDecryptUnit( status_t DrmManagerClient::finalizeDecryptUnit(
sp<DecryptHandle> &decryptHandle, int decryptUnitId) { sp<DecryptHandle> &decryptHandle, int decryptUnitId) {
Mutex::Autolock _l(mDecryptLock);
return mDrmManagerClientImpl->finalizeDecryptUnit(mUniqueId, return mDrmManagerClientImpl->finalizeDecryptUnit(mUniqueId,
decryptHandle, decryptUnitId); decryptHandle, decryptUnitId);
} }
ssize_t DrmManagerClient::pread( ssize_t DrmManagerClient::pread(
sp<DecryptHandle> &decryptHandle, void* buffer, ssize_t numBytes, off64_t offset) { sp<DecryptHandle> &decryptHandle, void* buffer, ssize_t numBytes, off64_t offset) {
Mutex::Autolock _l(mDecryptLock);
return mDrmManagerClientImpl->pread(mUniqueId, decryptHandle, buffer, numBytes, offset); return mDrmManagerClientImpl->pread(mUniqueId, decryptHandle, buffer, numBytes, offset);
} }

1
drm/libdrmframework/include/DrmManager.h
View File

@@ -147,6 +147,7 @@ private:
int mDecryptSessionId; int mDecryptSessionId;
int mConvertId; int mConvertId;
Mutex mLock; Mutex mLock;
Mutex mListenerLock;
Mutex mDecryptLock; Mutex mDecryptLock;
Mutex mConvertLock; Mutex mConvertLock;
TPlugInManager<IDrmEngine> mPlugInManager; TPlugInManager<IDrmEngine> mPlugInManager;

1
include/drm/DrmManagerClient.h
View File

@@ -368,7 +368,6 @@ public:
private: private:
int mUniqueId; int mUniqueId;
Mutex mDecryptLock;
DrmManagerClientImpl* mDrmManagerClientImpl; DrmManagerClientImpl* mDrmManagerClientImpl;
}; };