display: Clean up binder interface
The current binder implementation is inflexible when it comes to
adding new input/output parameters. It also needs a lot of
boilerplate code written when adding a simple enable/disable type
command.
Instead, let clients specify the parcels they want to pass and
unparcel them at the end points only.
Please note that it is assumed that all commands coming in
need the same permission checks. If this is no longer the case,
some commands need to be split out on the receiver end in
IQService.cpp.
This change also simplifies the code end clients need to write.
They should be able to include QServiceUtils and call a single
function to set the binder up and make the call.
Change-Id: I4db66f2427ecf16d7a6264462ae85815217a16b1
diff --git a/libhwcomposer/hwc_qclient.cpp b/libhwcomposer/hwc_qclient.cpp
index a17565b..3b98788 100644
--- a/libhwcomposer/hwc_qclient.cpp
+++ b/libhwcomposer/hwc_qclient.cpp
@@ -51,57 +51,28 @@
ALOGD_IF(QCLIENT_DEBUG,"QClient Destructor invoked");
}
-status_t QClient::notifyCallback(uint32_t msg, uint32_t value) {
-
- if (msg > IQService::VPU_COMMAND_LIST_START &&
- msg < IQService::VPU_COMMAND_LIST_END) {
- return vpuCommand(msg, value);
- }
-
- switch(msg) {
- case IQService::SECURING:
- securing(value);
- break;
- case IQService::UNSECURING:
- unsecuring(value);
- break;
- case IQService::SCREEN_REFRESH:
- return screenRefresh();
- break;
- case IQService::EXTERNAL_ORIENTATION:
- setExtOrientation(value);
- break;
- case IQService::BUFFER_MIRRORMODE:
- setBufferMirrorMode(value);
- break;
- default:
- return NO_ERROR;
- }
- return NO_ERROR;
-}
-
-void QClient::securing(uint32_t startEnd) {
- Locker::Autolock _sl(mHwcContext->mDrawLock);
+static void securing(hwc_context_t *ctx, uint32_t startEnd) {
+ Locker::Autolock _sl(ctx->mDrawLock);
//The only way to make this class in this process subscribe to media
//player's death.
IMediaDeathNotifier::getMediaPlayerService();
- mHwcContext->mSecuring = startEnd;
+ ctx->mSecuring = startEnd;
//We're done securing
if(startEnd == IQService::END)
- mHwcContext->mSecureMode = true;
- if(mHwcContext->proc)
- mHwcContext->proc->invalidate(mHwcContext->proc);
+ ctx->mSecureMode = true;
+ if(ctx->proc)
+ ctx->proc->invalidate(ctx->proc);
}
-void QClient::unsecuring(uint32_t startEnd) {
- Locker::Autolock _sl(mHwcContext->mDrawLock);
- mHwcContext->mSecuring = startEnd;
+static void unsecuring(hwc_context_t *ctx, uint32_t startEnd) {
+ Locker::Autolock _sl(ctx->mDrawLock);
+ ctx->mSecuring = startEnd;
//We're done unsecuring
if(startEnd == IQService::END)
- mHwcContext->mSecureMode = false;
- if(mHwcContext->proc)
- mHwcContext->proc->invalidate(mHwcContext->proc);
+ ctx->mSecureMode = false;
+ if(ctx->proc)
+ ctx->proc->invalidate(ctx->proc);
}
void QClient::MPDeathNotifier::died() {
@@ -113,33 +84,68 @@
mHwcContext->proc->invalidate(mHwcContext->proc);
}
-android::status_t QClient::screenRefresh() {
+static android::status_t screenRefresh(hwc_context_t *ctx) {
status_t result = NO_INIT;
#ifdef QCOM_BSP
- if(mHwcContext->proc) {
- mHwcContext->proc->invalidate(mHwcContext->proc);
+ if(ctx->proc) {
+ ctx->proc->invalidate(ctx->proc);
result = NO_ERROR;
}
#endif
return result;
}
-android::status_t QClient::vpuCommand(uint32_t command, uint32_t setting) {
+static android::status_t vpuCommand(hwc_context_t *ctx,
+ uint32_t command,
+ const Parcel* inParcel,
+ Parcel* outParcel) {
status_t result = NO_INIT;
#ifdef QCOM_BSP
#ifdef VPU_TARGET
- result = mHwcContext->mVPUClient->processCommand(command, setting);
+ result = ctx->mVPUClient->processCommand(command, inParcel, outParcel);
#endif
#endif
return result;
}
-void QClient::setExtOrientation(uint32_t orientation) {
- mHwcContext->mExtOrientation = orientation;
+static void setExtOrientation(hwc_context_t *ctx, uint32_t orientation) {
+ ctx->mExtOrientation = orientation;
}
-void QClient::setBufferMirrorMode(uint32_t enable) {
- mHwcContext->mBufferMirrorMode = enable;
+static void setBufferMirrorMode(hwc_context_t *ctx, uint32_t enable) {
+ ctx->mBufferMirrorMode = enable;
}
+status_t QClient::notifyCallback(uint32_t command, const Parcel* inParcel,
+ Parcel* outParcel) {
+
+ if (command > IQService::VPU_COMMAND_LIST_START &&
+ command < IQService::VPU_COMMAND_LIST_END) {
+ return vpuCommand(mHwcContext, command, inParcel, outParcel);
+ }
+
+ switch(command) {
+ case IQService::SECURING:
+ securing(mHwcContext, inParcel->readInt32());
+ break;
+ case IQService::UNSECURING:
+ unsecuring(mHwcContext, inParcel->readInt32());
+ break;
+ case IQService::SCREEN_REFRESH:
+ return screenRefresh(mHwcContext);
+ break;
+ case IQService::EXTERNAL_ORIENTATION:
+ setExtOrientation(mHwcContext, inParcel->readInt32());
+ break;
+ case IQService::BUFFER_MIRRORMODE:
+ setBufferMirrorMode(mHwcContext, inParcel->readInt32());
+ break;
+ default:
+ return NO_ERROR;
+ }
+ return NO_ERROR;
+}
+
+
+
}