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

Fix more unused parameter warnings in frameworks/av/drm.

Browse Source 
Bug: 27151704
Change-Id: Id153f12623b5d9d447f3f0605c30caf8743c367c
This commit is contained in:
Aurimas Liutikas
2016-02-12 16:57:08 -08:00
parent 9129c06770
commit b2231171d8
6 changed files with 73 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drm/drmserver/DrmManager.cpp
View File

@@ -370,7 +370,7 @@ DrmConvertedStatus* DrmManager::closeConvertSession(int uniqueId, int convertId)
} }
status_t DrmManager::getAllSupportInfo( status_t DrmManager::getAllSupportInfo(
int uniqueId, int* length, DrmSupportInfo** drmSupportInfoArray) { int /* uniqueId */, int* length, DrmSupportInfo** drmSupportInfoArray) {
Mutex::Autolock _l(mLock); Mutex::Autolock _l(mLock);
Vector<String8> plugInPathList = mPlugInManager.getPlugInIdList(); Vector<String8> plugInPathList = mPlugInManager.getPlugInIdList();
int size = plugInPathList.size(); int size = plugInPathList.size();

2
drm/drmserver/main_drmserver.cpp
View File

@@ -26,7 +26,7 @@
using namespace android; using namespace android;
int main(int argc, char** argv) int main()
{ {
sp<ProcessState> proc(ProcessState::self()); sp<ProcessState> proc(ProcessState::self());
sp<IServiceManager> sm = defaultServiceManager(); sp<IServiceManager> sm = defaultServiceManager();

16
drm/libdrmframework/plugins/common/include/DrmEngineBase.h
View File

@@ -398,9 +398,9 @@ protected:
* DRM_ERROR_CANNOT_HANDLE for failure and DRM_NO_ERROR for success * DRM_ERROR_CANNOT_HANDLE for failure and DRM_NO_ERROR for success
*/ */
virtual status_t onOpenDecryptSession( virtual status_t onOpenDecryptSession(
int uniqueId, DecryptHandle* decryptHandle, int /* uniqueId */, DecryptHandle* /* decryptHandle */,
int fd, off64_t offset, off64_t length, int /* fd */, off64_t /* offset */, off64_t /* length */,
const char* mime) { const char* /* mime */) {
return DRM_ERROR_CANNOT_HANDLE; return DRM_ERROR_CANNOT_HANDLE;
} }
@@ -430,8 +430,8 @@ protected:
* DRM_ERROR_CANNOT_HANDLE for failure and DRM_NO_ERROR for success * DRM_ERROR_CANNOT_HANDLE for failure and DRM_NO_ERROR for success
*/ */
virtual status_t onOpenDecryptSession( virtual status_t onOpenDecryptSession(
int uniqueId, DecryptHandle* decryptHandle, int /* uniqueId */, DecryptHandle* /* decryptHandle */,
const char* uri, const char* mime) { const char* /* uri */, const char* /* mime */) {
return DRM_ERROR_CANNOT_HANDLE; return DRM_ERROR_CANNOT_HANDLE;
} }
@@ -446,8 +446,10 @@ protected:
* @return * @return
* DRM_ERROR_CANNOT_HANDLE for failure and DRM_NO_ERROR for success * DRM_ERROR_CANNOT_HANDLE for failure and DRM_NO_ERROR for success
*/ */
virtual status_t onOpenDecryptSession(int uniqueId, DecryptHandle* decryptHandle, virtual status_t onOpenDecryptSession(int /* uniqueId */,
const DrmBuffer& buf, const String8& mimeType) { DecryptHandle* /* decryptHandle */,
const DrmBuffer& /* buf */,
const String8& /* mimeType */) {
return DRM_ERROR_CANNOT_HANDLE; return DRM_ERROR_CANNOT_HANDLE;
} }

110
drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
View File

@@ -119,7 +119,7 @@ DrmConstraints* FwdLockEngine::onGetConstraints(int uniqueId, const String8* pat
return drmConstraints; return drmConstraints;
} }
DrmMetadata* FwdLockEngine::onGetMetadata(int uniqueId, const String8* path) { DrmMetadata* FwdLockEngine::onGetMetadata(int /* uniqueId */, const String8* path) {
DrmMetadata* drmMetadata = NULL; DrmMetadata* drmMetadata = NULL;
LOG_VERBOSE("FwdLockEngine::onGetMetadata"); LOG_VERBOSE("FwdLockEngine::onGetMetadata");
@@ -132,7 +132,7 @@ DrmMetadata* FwdLockEngine::onGetMetadata(int uniqueId, const String8* path) {
return drmMetadata; return drmMetadata;
} }
android::status_t FwdLockEngine::onInitialize(int uniqueId) { android::status_t FwdLockEngine::onInitialize(int /* uniqueId */) {
LOG_VERBOSE("FwdLockEngine::onInitialize"); LOG_VERBOSE("FwdLockEngine::onInitialize");
if (FwdLockGlue_InitializeKeyEncryption()) { if (FwdLockGlue_InitializeKeyEncryption()) {
@@ -146,14 +146,16 @@ android::status_t FwdLockEngine::onInitialize(int uniqueId) {
} }
android::status_t android::status_t
FwdLockEngine::onSetOnInfoListener(int uniqueId, const IDrmEngine::OnInfoListener* infoListener) { FwdLockEngine::onSetOnInfoListener(
int /* uniqueId */,
const IDrmEngine::OnInfoListener* /* infoListener */) {
// Not used // Not used
LOG_VERBOSE("FwdLockEngine::onSetOnInfoListener"); LOG_VERBOSE("FwdLockEngine::onSetOnInfoListener");
return DRM_NO_ERROR; return DRM_NO_ERROR;
} }
android::status_t FwdLockEngine::onTerminate(int uniqueId) { android::status_t FwdLockEngine::onTerminate(int /* uniqueId */) {
LOG_VERBOSE("FwdLockEngine::onTerminate"); LOG_VERBOSE("FwdLockEngine::onTerminate");
return DRM_NO_ERROR; return DRM_NO_ERROR;
@@ -207,7 +209,7 @@ bool FwdLockEngine::IsFileSuffixSupported(const String8& suffix) {
return false; return false;
} }
DrmSupportInfo* FwdLockEngine::onGetSupportInfo(int uniqueId) { DrmSupportInfo* FwdLockEngine::onGetSupportInfo(int /* uniqueId */) {
DrmSupportInfo* pSupportInfo = new DrmSupportInfo(); DrmSupportInfo* pSupportInfo = new DrmSupportInfo();
LOG_VERBOSE("FwdLockEngine::onGetSupportInfo"); LOG_VERBOSE("FwdLockEngine::onGetSupportInfo");
@@ -222,14 +224,14 @@ DrmSupportInfo* FwdLockEngine::onGetSupportInfo(int uniqueId) {
return pSupportInfo; return pSupportInfo;
} }
bool FwdLockEngine::onCanHandle(int uniqueId, const String8& path) { bool FwdLockEngine::onCanHandle(int /* uniqueId */, const String8& path) {
bool result = false; bool result = false;
String8 extString = path.getPathExtension(); String8 extString = path.getPathExtension();
return IsFileSuffixSupported(extString); return IsFileSuffixSupported(extString);
} }
DrmInfoStatus* FwdLockEngine::onProcessDrmInfo(int uniqueId, const DrmInfo* drmInfo) { DrmInfoStatus* FwdLockEngine::onProcessDrmInfo(int /* uniqueId */, const DrmInfo* /* drmInfo */) {
DrmInfoStatus *drmInfoStatus = NULL; DrmInfoStatus *drmInfoStatus = NULL;
// Nothing to process // Nothing to process
@@ -242,16 +244,17 @@ DrmInfoStatus* FwdLockEngine::onProcessDrmInfo(int uniqueId, const DrmInfo* drmI
} }
status_t FwdLockEngine::onSaveRights( status_t FwdLockEngine::onSaveRights(
int uniqueId, int /* uniqueId */,
const DrmRights& drmRights, const DrmRights& /* drmRights */,
const String8& rightsPath, const String8& /* rightsPath */,
const String8& contentPath) { const String8& /* contentPath */) {
// No rights to save. Return // No rights to save. Return
LOG_VERBOSE("FwdLockEngine::onSaveRights"); LOG_VERBOSE("FwdLockEngine::onSaveRights");
return DRM_ERROR_UNKNOWN; return DRM_ERROR_UNKNOWN;
} }
DrmInfo* FwdLockEngine::onAcquireDrmInfo(int uniqueId, const DrmInfoRequest* drmInfoRequest) { DrmInfo* FwdLockEngine::onAcquireDrmInfo(
int /* uniqueId */, const DrmInfoRequest* /* drmInfoRequest */) {
DrmInfo* drmInfo = NULL; DrmInfo* drmInfo = NULL;
// Nothing to be done for Forward Lock file // Nothing to be done for Forward Lock file
@@ -290,10 +293,10 @@ int FwdLockEngine::onCheckRightsStatus(int uniqueId,
return result; return result;
} }
status_t FwdLockEngine::onConsumeRights(int uniqueId, status_t FwdLockEngine::onConsumeRights(int /* uniqueId */,
DecryptHandle* decryptHandle, DecryptHandle* /* decryptHandle */,
int action, int /* action */,
bool reserve) { bool /* reserve */) {
// No rights consumption // No rights consumption
LOG_VERBOSE("FwdLockEngine::onConsumeRights"); LOG_VERBOSE("FwdLockEngine::onConsumeRights");
return DRM_NO_ERROR; return DRM_NO_ERROR;
@@ -302,14 +305,16 @@ status_t FwdLockEngine::onConsumeRights(int uniqueId,
bool FwdLockEngine::onValidateAction(int uniqueId, bool FwdLockEngine::onValidateAction(int uniqueId,
const String8& path, const String8& path,
int action, int action,
const ActionDescription& description) { const ActionDescription& /* description */) {
LOG_VERBOSE("FwdLockEngine::onValidateAction"); LOG_VERBOSE("FwdLockEngine::onValidateAction");
// For the forwardlock engine checkRights and ValidateAction are the same. // For the forwardlock engine checkRights and ValidateAction are the same.
return (onCheckRightsStatus(uniqueId, path, action) == RightsStatus::RIGHTS_VALID); return (onCheckRightsStatus(uniqueId, path, action) == RightsStatus::RIGHTS_VALID);
} }
String8 FwdLockEngine::onGetOriginalMimeType(int uniqueId, const String8& path, int fd) { String8 FwdLockEngine::onGetOriginalMimeType(int /* uniqueId */,
const String8& /* path */,
int fd) {
LOG_VERBOSE("FwdLockEngine::onGetOriginalMimeType"); LOG_VERBOSE("FwdLockEngine::onGetOriginalMimeType");
String8 mimeString = String8(""); String8 mimeString = String8("");
int fileDesc = dup(fd); int fileDesc = dup(fd);
@@ -354,32 +359,32 @@ int FwdLockEngine::onGetDrmObjectType(int uniqueId,
return DrmObjectType::UNKNOWN; return DrmObjectType::UNKNOWN;
} }
status_t FwdLockEngine::onRemoveRights(int uniqueId, const String8& path) { status_t FwdLockEngine::onRemoveRights(int /* uniqueId */, const String8& /* path */) {
// No Rights to remove // No Rights to remove
LOG_VERBOSE("FwdLockEngine::onRemoveRights"); LOG_VERBOSE("FwdLockEngine::onRemoveRights");
return DRM_NO_ERROR; return DRM_NO_ERROR;
} }
status_t FwdLockEngine::onRemoveAllRights(int uniqueId) { status_t FwdLockEngine::onRemoveAllRights(int /* uniqueId */) {
// No rights to remove // No rights to remove
LOG_VERBOSE("FwdLockEngine::onRemoveAllRights"); LOG_VERBOSE("FwdLockEngine::onRemoveAllRights");
return DRM_NO_ERROR; return DRM_NO_ERROR;
} }
#ifdef USE_64BIT_DRM_API #ifdef USE_64BIT_DRM_API
status_t FwdLockEngine::onSetPlaybackStatus(int uniqueId, DecryptHandle* decryptHandle, status_t FwdLockEngine::onSetPlaybackStatus(int /* uniqueId */, DecryptHandle* /* decryptHandle */,
int playbackStatus, int64_t position) { int /* playbackStatus */, int64_t /* position */) {
#else #else
status_t FwdLockEngine::onSetPlaybackStatus(int uniqueId, DecryptHandle* decryptHandle, status_t FwdLockEngine::onSetPlaybackStatus(int /* uniqueId */, DecryptHandle* /* decryptHandle */,
int playbackStatus, int position) { int /* playbackStatus */, int /* position */) {
#endif #endif
// Not used // Not used
LOG_VERBOSE("FwdLockEngine::onSetPlaybackStatus"); LOG_VERBOSE("FwdLockEngine::onSetPlaybackStatus");
return DRM_NO_ERROR; return DRM_NO_ERROR;
} }
status_t FwdLockEngine::onOpenConvertSession(int uniqueId, status_t FwdLockEngine::onOpenConvertSession(
int convertId) { int /* uniqueId */, int convertId) {
status_t result = DRM_ERROR_UNKNOWN; status_t result = DRM_ERROR_UNKNOWN;
LOG_VERBOSE("FwdLockEngine::onOpenConvertSession"); LOG_VERBOSE("FwdLockEngine::onOpenConvertSession");
if (!convertSessionMap.isCreated(convertId)) { if (!convertSessionMap.isCreated(convertId)) {
@@ -396,7 +401,7 @@ status_t FwdLockEngine::onOpenConvertSession(int uniqueId,
return result; return result;
} }
DrmConvertedStatus* FwdLockEngine::onConvertData(int uniqueId, DrmConvertedStatus* FwdLockEngine::onConvertData(int /* uniqueId */,
int convertId, int convertId,
const DrmBuffer* inputData) { const DrmBuffer* inputData) {
FwdLockConv_Status_t retStatus = FwdLockConv_Status_InvalidArgument; FwdLockConv_Status_t retStatus = FwdLockConv_Status_InvalidArgument;
@@ -432,7 +437,7 @@ DrmConvertedStatus* FwdLockEngine::onConvertData(int uniqueId,
return new DrmConvertedStatus(getConvertedStatus(retStatus), convResult, offset); return new DrmConvertedStatus(getConvertedStatus(retStatus), convResult, offset);
} }
DrmConvertedStatus* FwdLockEngine::onCloseConvertSession(int uniqueId, DrmConvertedStatus* FwdLockEngine::onCloseConvertSession(int /* uniqueId */,
int convertId) { int convertId) {
FwdLockConv_Status_t retStatus = FwdLockConv_Status_InvalidArgument; FwdLockConv_Status_t retStatus = FwdLockConv_Status_InvalidArgument;
DrmBuffer *convResult = new DrmBuffer(NULL, 0); DrmBuffer *convResult = new DrmBuffer(NULL, 0);
@@ -464,17 +469,17 @@ DrmConvertedStatus* FwdLockEngine::onCloseConvertSession(int uniqueId,
} }
#ifdef USE_64BIT_DRM_API #ifdef USE_64BIT_DRM_API
status_t FwdLockEngine::onOpenDecryptSession(int uniqueId, status_t FwdLockEngine::onOpenDecryptSession(int /* uniqueId */,
DecryptHandle* decryptHandle, DecryptHandle* decryptHandle,
int fd, int fd,
off64_t offset, off64_t offset,
off64_t length) { off64_t /* length */) {
#else #else
status_t FwdLockEngine::onOpenDecryptSession(int uniqueId, status_t FwdLockEngine::onOpenDecryptSession(int /* uniqueId */,
DecryptHandle* decryptHandle, DecryptHandle* decryptHandle,
int fd, int fd,
int offset, int offset,
int length) { int /* length */) {
#endif #endif
status_t result = DRM_ERROR_CANNOT_HANDLE; status_t result = DRM_ERROR_CANNOT_HANDLE;
int fileDesc = -1; int fileDesc = -1;
@@ -552,7 +557,7 @@ status_t FwdLockEngine::onOpenDecryptSession(int uniqueId,
return result; return result;
} }
status_t FwdLockEngine::onCloseDecryptSession(int uniqueId, status_t FwdLockEngine::onCloseDecryptSession(int /* uniqueId */,
DecryptHandle* decryptHandle) { DecryptHandle* decryptHandle) {
status_t result = DRM_ERROR_UNKNOWN; status_t result = DRM_ERROR_UNKNOWN;
LOG_VERBOSE("FwdLockEngine::onCloseDecryptSession"); LOG_VERBOSE("FwdLockEngine::onCloseDecryptSession");
@@ -584,37 +589,42 @@ status_t FwdLockEngine::onCloseDecryptSession(int uniqueId,
return result; return result;
} }
status_t FwdLockEngine::onInitializeDecryptUnit(int uniqueId, status_t FwdLockEngine::onInitializeDecryptUnit(int /* uniqueId */,
DecryptHandle* decryptHandle, DecryptHandle* /* decryptHandle */,
int decryptUnitId, int /* decryptUnitId */,
const DrmBuffer* headerInfo) { const DrmBuffer* /* headerInfo */) {
ALOGE("FwdLockEngine::onInitializeDecryptUnit is not supported for this DRM scheme"); ALOGE("FwdLockEngine::onInitializeDecryptUnit is not supported for this DRM scheme");
return DRM_ERROR_UNKNOWN; return DRM_ERROR_UNKNOWN;
} }
status_t FwdLockEngine::onDecrypt(int uniqueId, DecryptHandle* decryptHandle, int decryptUnitId, status_t FwdLockEngine::onDecrypt(
const DrmBuffer* encBuffer, DrmBuffer** decBuffer, DrmBuffer* IV) { int /* uniqueId */,
DecryptHandle* /* decryptHandle */,
int /* decryptUnitId */,
const DrmBuffer* /* encBuffer */,
DrmBuffer** /* decBuffer */,
DrmBuffer* /* IV */) {
ALOGE("FwdLockEngine::onDecrypt is not supported for this DRM scheme"); ALOGE("FwdLockEngine::onDecrypt is not supported for this DRM scheme");
return DRM_ERROR_UNKNOWN; return DRM_ERROR_UNKNOWN;
} }
status_t FwdLockEngine::onDecrypt(int uniqueId, status_t FwdLockEngine::onDecrypt(int /* uniqueId */,
DecryptHandle* decryptHandle, DecryptHandle* /* decryptHandle */,
int decryptUnitId, int /* decryptUnitId */,
const DrmBuffer* encBuffer, const DrmBuffer* /* encBuffer */,
DrmBuffer** decBuffer) { DrmBuffer** /* decBuffer */) {
ALOGE("FwdLockEngine::onDecrypt is not supported for this DRM scheme"); ALOGE("FwdLockEngine::onDecrypt is not supported for this DRM scheme");
return DRM_ERROR_UNKNOWN; return DRM_ERROR_UNKNOWN;
} }
status_t FwdLockEngine::onFinalizeDecryptUnit(int uniqueId, status_t FwdLockEngine::onFinalizeDecryptUnit(int /* uniqueId */,
DecryptHandle* decryptHandle, DecryptHandle* /* decryptHandle */,
int decryptUnitId) { int /* decryptUnitId */) {
ALOGE("FwdLockEngine::onFinalizeDecryptUnit is not supported for this DRM scheme"); ALOGE("FwdLockEngine::onFinalizeDecryptUnit is not supported for this DRM scheme");
return DRM_ERROR_UNKNOWN; return DRM_ERROR_UNKNOWN;
} }
ssize_t FwdLockEngine::onRead(int uniqueId, ssize_t FwdLockEngine::onRead(int /* uniqueId */,
DecryptHandle* decryptHandle, DecryptHandle* decryptHandle,
void* buffer, void* buffer,
int numBytes) { int numBytes) {
@@ -640,10 +650,10 @@ ssize_t FwdLockEngine::onRead(int uniqueId,
} }
#ifdef USE_64BIT_DRM_API #ifdef USE_64BIT_DRM_API
off64_t FwdLockEngine::onLseek(int uniqueId, DecryptHandle* decryptHandle, off64_t FwdLockEngine::onLseek(int /* uniqueId */, DecryptHandle* decryptHandle,
off64_t offset, int whence) { off64_t offset, int whence) {
#else #else
off_t FwdLockEngine::onLseek(int uniqueId, DecryptHandle* decryptHandle, off_t FwdLockEngine::onLseek(int /* uniqueId */, DecryptHandle* decryptHandle,
off_t offset, int whence) { off_t offset, int whence) {
#endif #endif
off_t offval = -1; off_t offval = -1;

2
drm/mediadrm/plugins/clearkey/CryptoPlugin.cpp
View File

@@ -33,7 +33,7 @@ using android::status_t;
// decrypted data. In theory, the output size can be larger than the input // decrypted data. In theory, the output size can be larger than the input
// size, but in practice this will never happen for AES-CTR. // size, but in practice this will never happen for AES-CTR.
ssize_t CryptoPlugin::decrypt(bool secure, const KeyId keyId, const Iv iv, ssize_t CryptoPlugin::decrypt(bool secure, const KeyId keyId, const Iv iv,
Mode mode, const Pattern &pattern, const void* srcPtr, Mode mode, const Pattern &/* pattern */, const void* srcPtr,
const SubSample* subSamples, size_t numSubSamples, const SubSample* subSamples, size_t numSubSamples,
void* dstPtr, AString* errorDetailMsg) { void* dstPtr, AString* errorDetailMsg) {
if (secure) { if (secure) {