summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-12-15 07:57:55 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-15 07:57:55 +0000
commitc25a3cf4d2c950f8273b7c2cd0a77b0b3b162be5 (patch)
tree1faa9dae9f65aca90e915d37d2cc1ca049bfc680 /include/media
parente2caadca83c8842bbfe74e21f11b9e2b5aeb4e13 (diff)
parent28edf080bf0330cfb5371f70055982d38a86c23c (diff)
downloadnative-c25a3cf4d2c950f8273b7c2cd0a77b0b3b162be5.tar.gz
Merge "Fix unused-parameter warning" am: a2a7195e23 am: d05a784d55 am: 3fb5c68e04
am: 28edf080bf Change-Id: If2d50fa3c38bb1001806f443473e8f194ed968f8
Diffstat (limited to 'include/media')
-rw-r--r--include/media/hardware/HDCPAPI.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/media/hardware/HDCPAPI.h b/include/media/hardware/HDCPAPI.h
index 3a53e9fc90..30cd5fd9f2 100644
--- a/include/media/hardware/HDCPAPI.h
+++ b/include/media/hardware/HDCPAPI.h
@@ -73,7 +73,7 @@ struct HDCPModule {
// Module can call the notification function to signal completion/failure
// of asynchronous operations (such as initialization) or out of band
// events.
- HDCPModule(void *cookie, ObserverFunc observerNotify) {};
+ HDCPModule(void * /*cookie*/, ObserverFunc /*observerNotify*/) {};
virtual ~HDCPModule() {};
@@ -104,8 +104,8 @@ struct HDCPModule {
// 1 for the second and so on)
// inputCTR _will_be_maintained_by_the_callee_ for each PES stream.
virtual status_t encrypt(
- const void *inData, size_t size, uint32_t streamCTR,
- uint64_t *outInputCTR, void *outData) {
+ const void * /*inData*/, size_t /*size*/, uint32_t /*streamCTR*/,
+ uint64_t * /*outInputCTR*/, void * /*outData*/) {
return INVALID_OPERATION;
}
@@ -119,8 +119,8 @@ struct HDCPModule {
// 1 for the second and so on)
// inputCTR _will_be_maintained_by_the_callee_ for each PES stream.
virtual status_t encryptNative(
- buffer_handle_t buffer, size_t offset, size_t size,
- uint32_t streamCTR, uint64_t *outInputCTR, void *outData) {
+ buffer_handle_t /*buffer*/, size_t /*offset*/, size_t /*size*/,
+ uint32_t /*streamCTR*/, uint64_t * /*outInputCTR*/, void * /*outData*/) {
return INVALID_OPERATION;
}
// DECRYPTION only:
@@ -133,9 +133,9 @@ struct HDCPModule {
// until outData contains size bytes of decrypted data.
// Both streamCTR and inputCTR will be provided by the caller.
virtual status_t decrypt(
- const void *inData, size_t size,
- uint32_t streamCTR, uint64_t inputCTR,
- void *outData) {
+ const void * /*inData*/, size_t /*size*/,
+ uint32_t /*streamCTR*/, uint64_t /*inputCTR*/,
+ void * /*outData*/) {
return INVALID_OPERATION;
}