display: Add support for overscan compensation for ext display
- Read scan_info sys file node to check if TV underscans
- Apply action safe parameters to avoid overscan on ext display
- Store action safe width and height ratio using system property
- Use these to calculate the destination position on the ext display
- Remove unsed ActionSafe Class
Change-Id: Id27e6fa20966fb13fc16aa7e237cacce8caeb642
CRs-fixed: 447367
diff --git a/libhwcomposer/hwc_fbupdate.cpp b/libhwcomposer/hwc_fbupdate.cpp
index 18f75eb..a0dbbe3 100644
--- a/libhwcomposer/hwc_fbupdate.cpp
+++ b/libhwcomposer/hwc_fbupdate.cpp
@@ -104,6 +104,9 @@
displayFrame.top,
displayFrame.right - displayFrame.left,
displayFrame.bottom - displayFrame.top);
+ // Calculate the actionsafe dimensions for External(dpy = 1 or 2)
+ if(mDpy)
+ getActionSafePosition(ctx, mDpy, dpos.x, dpos.y, dpos.w, dpos.h);
ov.setPosition(dpos, dest);
ret = true;
diff --git a/libhwcomposer/hwc_utils.cpp b/libhwcomposer/hwc_utils.cpp
index e1f413c..ee7c25d 100644
--- a/libhwcomposer/hwc_utils.cpp
+++ b/libhwcomposer/hwc_utils.cpp
@@ -148,6 +148,55 @@
va_end(varargs);
}
+/* Calculates the destination position based on the action safe rectangle */
+void getActionSafePosition(hwc_context_t *ctx, int dpy, uint32_t& x,
+ uint32_t& y, uint32_t& w, uint32_t& h) {
+
+ // if external supports underscan, do nothing
+ // it will be taken care in the driver
+ if(ctx->mExtDisplay->isCEUnderscanSupported())
+ return;
+
+ float wRatio = 1.0;
+ float hRatio = 1.0;
+ float xRatio = 1.0;
+ float yRatio = 1.0;
+
+ float fbWidth = ctx->dpyAttr[dpy].xres;
+ float fbHeight = ctx->dpyAttr[dpy].yres;
+
+ float asX = 0;
+ float asY = 0;
+ float asW = fbWidth;
+ float asH= fbHeight;
+ char value[PROPERTY_VALUE_MAX];
+
+ // Apply action safe parameters
+ property_get("hw.actionsafe.width", value, "0");
+ int asWidthRatio = atoi(value);
+ property_get("hw.actionsafe.height", value, "0");
+ int asHeightRatio = atoi(value);
+ // based on the action safe ratio, get the Action safe rectangle
+ asW = fbWidth * (1.0f - asWidthRatio / 100.0f);
+ asH = fbHeight * (1.0f - asHeightRatio / 100.0f);
+ asX = (fbWidth - asW) / 2;
+ asY = (fbHeight - asH) / 2;
+
+ // calculate the position ratio
+ xRatio = (float)x/fbWidth;
+ yRatio = (float)y/fbHeight;
+ wRatio = (float)w/fbWidth;
+ hRatio = (float)h/fbHeight;
+
+ //Calculate the position...
+ x = (xRatio * asW) + asX;
+ y = (yRatio * asH) + asY;
+ w = (wRatio * asW);
+ h = (hRatio * asH);
+
+ return;
+}
+
static inline bool isAlphaScaled(hwc_layer_1_t const* layer) {
int dst_w, dst_h, src_w, src_h;
diff --git a/libhwcomposer/hwc_utils.h b/libhwcomposer/hwc_utils.h
index 9692986..c66f7ff 100644
--- a/libhwcomposer/hwc_utils.h
+++ b/libhwcomposer/hwc_utils.h
@@ -136,6 +136,10 @@
//Helper function to dump logs
void dumpsys_log(android::String8& buf, const char* fmt, ...);
+/* Calculates the destination position based on the action safe rectangle */
+void getActionSafePosition(hwc_context_t *ctx, int dpy, uint32_t& x,
+ uint32_t& y, uint32_t& w, uint32_t& h);
+
//Sync point impl.
int hwc_sync(hwc_context_t *ctx, hwc_display_contents_1_t* list, int dpy,
int fd);
diff --git a/libhwcomposer/hwc_video.cpp b/libhwcomposer/hwc_video.cpp
index 0c0a40d..6abc7ae 100644
--- a/libhwcomposer/hwc_video.cpp
+++ b/libhwcomposer/hwc_video.cpp
@@ -171,6 +171,10 @@
displayFrame.top,
displayFrame.right - displayFrame.left,
displayFrame.bottom - displayFrame.top);
+ // Calculate the actionsafe dimensions for External(dpy = 1 or 2)
+ if(dpy)
+ getActionSafePosition(ctx, dpy, dpos.x, dpos.y, dpos.w, dpos.h);
+
ov.setPosition(dpos, dest);
if (!ov.commit(dest)) {