hwc: Do not show animation on External display.
- When primary is animating, the animation should not be
shown on the external display.
- Mark all app layers as HWC_OVERLAY on external during
animation so that SF wont compose it on FB.
Change-Id: Ic557cabfd9f2518614777c0e993541e36e090850
diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index 9dd95ff..22667bf 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -173,6 +173,10 @@
ctx->mExtDispConfiguring = false;
setListStats(ctx, list, dpy);
int fbZOrder = ctx->mMDPComp[dpy]->prepare(ctx, list);
+ if(ctx->deviceOrientation &&
+ ctx->listStats[dpy].isDisplayAnimating) {
+ fbZOrder = 0;
+ }
if(fbZOrder >= 0)
ctx->mFBUpdate[dpy]->prepare(ctx, list, fbZOrder);
@@ -182,6 +186,14 @@
if((fbZOrder >= 0) && ctx->mCopyBit[dpy])
ctx->mCopyBit[dpy]->prepare(ctx, list, dpy);
*/
+ if(ctx->listStats[dpy].isDisplayAnimating) {
+ // Mark all app layers as HWC_OVERLAY for external during
+ // animation, so that SF doesnt draw it on FB
+ for(int i = 0 ;i < ctx->listStats[dpy].numAppLayers; i++) {
+ hwc_layer_1_t *layer = &list->hwLayers[i];
+ layer->compositionType = HWC_OVERLAY;
+ }
+ }
}
} else {
// External Display is in Pause state.
@@ -246,6 +258,14 @@
ALOGD_IF (VSYNC_DEBUG, "VSYNC state changed to %s",
(enable)?"ENABLED":"DISABLED");
break;
+ case HWC_EVENT_ORIENTATION:
+ if(dpy == HWC_DISPLAY_PRIMARY) {
+ // store the primary display orientation
+ // will be used in hwc_video::configure to disable
+ // rotation animation on external display
+ ctx->deviceOrientation = enable;
+ }
+ break;
default:
ret = -EINVAL;
}
diff --git a/libhwcomposer/hwc_fbupdate.cpp b/libhwcomposer/hwc_fbupdate.cpp
index b9be4d4..42d0741 100644
--- a/libhwcomposer/hwc_fbupdate.cpp
+++ b/libhwcomposer/hwc_fbupdate.cpp
@@ -111,8 +111,13 @@
orient = static_cast<ovutils::eTransform >(ctx->mExtOrientation);
}
+ // Do not use getNonWormholeRegion() function to calculate the
+ // sourceCrop during animation on external display and
// Dont do wormhole calculation when extorientation is set on External
- if((!mDpy || (mDpy && !ctx->mExtOrientation))
+ if(ctx->listStats[mDpy].isDisplayAnimating && mDpy) {
+ sourceCrop = layer->displayFrame;
+ displayFrame = sourceCrop;
+ } else if((!mDpy || (mDpy && !ctx->mExtOrientation))
&& extOnlyLayerIndex == -1) {
getNonWormholeRegion(list, sourceCrop);
displayFrame = sourceCrop;
@@ -266,7 +271,12 @@
hwc_rect_t sourceCrop = layer->sourceCrop;
hwc_rect_t displayFrame = layer->displayFrame;
- if(extOnlyLayerIndex == -1) {
+ // Do not use getNonWormholeRegion() function to calculate the
+ // sourceCrop during animation on external display.
+ if(ctx->listStats[mDpy].isDisplayAnimating && mDpy) {
+ sourceCrop = layer->displayFrame;
+ displayFrame = sourceCrop;
+ } else if(extOnlyLayerIndex == -1) {
getNonWormholeRegion(list, sourceCrop);
displayFrame = sourceCrop;
}
diff --git a/libhwcomposer/hwc_mdpcomp.cpp b/libhwcomposer/hwc_mdpcomp.cpp
index 8ccf362..b88674f 100644
--- a/libhwcomposer/hwc_mdpcomp.cpp
+++ b/libhwcomposer/hwc_mdpcomp.cpp
@@ -515,7 +515,7 @@
/* Checks for conditions where YUV layers cannot be bypassed */
bool MDPComp::isYUVDoable(hwc_context_t* ctx, hwc_layer_1_t* layer) {
- if(isSkipLayer(layer)) {
+ if(isSkipLayer(layer) && mDpy == HWC_DISPLAY_PRIMARY) {
ALOGE("%s: Unable to bypass skipped YUV", __FUNCTION__);
return false;
}
@@ -626,6 +626,15 @@
void MDPComp::updateYUV(hwc_context_t* ctx, hwc_display_contents_1_t* list) {
int nYuvCount = ctx->listStats[mDpy].yuvCount;
+ if(!nYuvCount && mDpy) {
+ //Reset "No animation on external display" related parameters.
+ ctx->mPrevCropVideo.left = ctx->mPrevCropVideo.top =
+ ctx->mPrevCropVideo.right = ctx->mPrevCropVideo.bottom = 0;
+ ctx->mPrevDestVideo.left = ctx->mPrevDestVideo.top =
+ ctx->mPrevDestVideo.right = ctx->mPrevDestVideo.bottom = 0;
+ ctx->mPrevTransformVideo = 0;
+ return;
+ }
for(int index = 0;index < nYuvCount; index++){
int nYuvIndex = ctx->listStats[mDpy].yuvIndices[index];
hwc_layer_1_t* layer = &list->hwLayers[nYuvIndex];
diff --git a/libhwcomposer/hwc_utils.cpp b/libhwcomposer/hwc_utils.cpp
index 5a00578..5df31b0 100644
--- a/libhwcomposer/hwc_utils.cpp
+++ b/libhwcomposer/hwc_utils.cpp
@@ -166,6 +166,14 @@
defaultServiceManager()->getService(
String16("display.qservice")))->connect(client);
+ // Initialize "No animation on external display" related parameters.
+ ctx->deviceOrientation = 0;
+ ctx->mPrevCropVideo.left = ctx->mPrevCropVideo.top =
+ ctx->mPrevCropVideo.right = ctx->mPrevCropVideo.bottom = 0;
+ ctx->mPrevDestVideo.left = ctx->mPrevDestVideo.top =
+ ctx->mPrevDestVideo.right = ctx->mPrevDestVideo.bottom = 0;
+ ctx->mPrevTransformVideo = 0;
+
ALOGI("Initializing Qualcomm Hardware Composer");
ALOGI("MDP version: %d", ctx->mMDP.version);
}
@@ -353,6 +361,7 @@
ctx->listStats[dpy].yuvCount = 0;
char property[PROPERTY_VALUE_MAX];
ctx->listStats[dpy].extOnlyLayerIndex = -1;
+ ctx->listStats[dpy].isDisplayAnimating = false;
for (size_t i = 0; i < list->numHwLayers; i++) {
hwc_layer_1_t const* layer = &list->hwLayers[i];
@@ -366,7 +375,9 @@
//We disregard FB being skip for now! so the else if
} else if (isSkipLayer(&list->hwLayers[i])) {
ctx->listStats[dpy].skipCount++;
- } else if (UNLIKELY(isYuvBuffer(hnd))) {
+ }
+
+ if (UNLIKELY(isYuvBuffer(hnd))) {
int& yuvCount = ctx->listStats[dpy].yuvCount;
ctx->listStats[dpy].yuvIndices[yuvCount] = i;
yuvCount++;
@@ -387,6 +398,9 @@
if(UNLIKELY(isExtOnly(hnd))){
ctx->listStats[dpy].extOnlyLayerIndex = i;
}
+ if (layer->flags & HWC_SCREENSHOT_ANIMATOR_LAYER) {
+ ctx->listStats[dpy].isDisplayAnimating = true;
+ }
}
if(ctx->listStats[dpy].yuvCount > 0) {
if (property_get("hw.cabl.yuv", property, NULL) > 0) {
@@ -587,6 +601,9 @@
if(atoi(property) == 0)
swapzero = true;
}
+ bool isExtAnimating = false;
+ if(dpy)
+ isExtAnimating = ctx->listStats[dpy].isDisplayAnimating;
//Accumulate acquireFenceFds
for(uint32_t i = 0; i < list->numHwLayers; i++) {
@@ -635,7 +652,16 @@
//Populate releaseFenceFds.
if(UNLIKELY(swapzero))
list->hwLayers[i].releaseFenceFd = -1;
- else
+ else if(isExtAnimating) {
+ // Release all the app layer fds immediately,
+ // if animation is in progress.
+ hwc_layer_1_t const* layer = &list->hwLayers[i];
+ private_handle_t *hnd = (private_handle_t *)layer->handle;
+ if(isYuvBuffer(hnd)) {
+ list->hwLayers[i].releaseFenceFd = dup(releaseFd);
+ } else
+ list->hwLayers[i].releaseFenceFd = -1;
+ } else
list->hwLayers[i].releaseFenceFd = dup(releaseFd);
}
}
@@ -647,6 +673,11 @@
if (ctx->mCopyBit[dpy])
ctx->mCopyBit[dpy]->setReleaseFd(releaseFd);
+ // if external is animating, close the relaseFd
+ if(isExtAnimating) {
+ close(releaseFd);
+ releaseFd = -1;
+ }
if(UNLIKELY(swapzero)){
list->retireFenceFd = -1;
close(releaseFd);
@@ -670,10 +701,9 @@
void setMdpFlags(hwc_layer_1_t *layer,
ovutils::eMdpFlags &mdpFlags,
- int rotDownscale) {
+ int rotDownscale, int transform) {
private_handle_t *hnd = (private_handle_t *)layer->handle;
MetaData_t *metadata = (MetaData_t *)hnd->base_metadata;
- const int& transform = layer->transform;
if(layer->blending == HWC_BLENDING_PREMULT) {
ovutils::setMdpFlags(mdpFlags,
@@ -705,12 +735,12 @@
//No 90 component and no rot-downscale then flips done by MDP
//If we use rot then it might as well do flips
- if(!(layer->transform & HWC_TRANSFORM_ROT_90) && !rotDownscale) {
- if(layer->transform & HWC_TRANSFORM_FLIP_H) {
+ if(!(transform & HWC_TRANSFORM_ROT_90) && !rotDownscale) {
+ if(transform & HWC_TRANSFORM_FLIP_H) {
ovutils::setMdpFlags(mdpFlags, ovutils::OV_MDP_FLIP_H);
}
- if(layer->transform & HWC_TRANSFORM_FLIP_V) {
+ if(transform & HWC_TRANSFORM_FLIP_V) {
ovutils::setMdpFlags(mdpFlags, ovutils::OV_MDP_FLIP_V);
}
}
@@ -789,8 +819,8 @@
}
int configureLowRes(hwc_context_t *ctx, hwc_layer_1_t *layer,
- const int& dpy, eMdpFlags& mdpFlags, const eZorder& z,
- const eIsFg& isFg, const eDest& dest, Rotator **rot) {
+ const int& dpy, eMdpFlags& mdpFlags, eZorder& z,
+ eIsFg& isFg, const eDest& dest, Rotator **rot) {
private_handle_t *hnd = (private_handle_t *)layer->handle;
if(!hnd) {
@@ -809,6 +839,27 @@
Whf whf(hnd->width, hnd->height,
getMdpFormat(hnd->format), hnd->size);
+ if(dpy && isYuvBuffer(hnd)) {
+ if(!ctx->listStats[dpy].isDisplayAnimating) {
+ ctx->mPrevCropVideo = crop;
+ ctx->mPrevDestVideo = dst;
+ ctx->mPrevTransformVideo = transform;
+ } else {
+ // Restore the previous crop, dest rect and transform values, during
+ // animation to avoid displaying videos at random coordinates.
+ crop = ctx->mPrevCropVideo;
+ dst = ctx->mPrevDestVideo;
+ transform = ctx->mPrevTransformVideo;
+ //In you tube use case when a device rotated from landscape to
+ // portrait, set the isFg flag and zOrder to avoid displaying UI on
+ // hdmi during animation
+ if(ctx->deviceOrientation) {
+ isFg = ovutils::IS_FG_SET;
+ z = ZORDER_1;
+ }
+ }
+ }
+
uint32_t x = dst.left, y = dst.right;
uint32_t w = dst.right - dst.left;
uint32_t h = dst.bottom - dst.top;
@@ -836,7 +887,7 @@
}
}
- setMdpFlags(layer, mdpFlags, downscale);
+ setMdpFlags(layer, mdpFlags, downscale, transform);
trimLayer(ctx, dpy, transform, crop, dst);
if(isYuvBuffer(hnd) && //if 90 component or downscale, use rot
@@ -856,7 +907,6 @@
//For the mdp, since either we are pre-rotating or MDP does flips
orient = OVERLAY_TRANSFORM_0;
transform = 0;
-
PipeArgs parg(mdpFlags, whf, z, isFg, static_cast<eRotFlags>(rotFlags));
if(configMdp(ctx->mOverlay, parg, orient, crop, dst, metadata, dest) < 0) {
ALOGE("%s: commit failed for low res panel", __FUNCTION__);
@@ -866,8 +916,8 @@
}
int configureHighRes(hwc_context_t *ctx, hwc_layer_1_t *layer,
- const int& dpy, eMdpFlags& mdpFlagsL, const eZorder& z,
- const eIsFg& isFg, const eDest& lDest, const eDest& rDest,
+ const int& dpy, eMdpFlags& mdpFlagsL, eZorder& z,
+ eIsFg& isFg, const eDest& lDest, const eDest& rDest,
Rotator **rot) {
private_handle_t *hnd = (private_handle_t *)layer->handle;
if(!hnd) {
@@ -889,6 +939,28 @@
Whf whf(hnd->width, hnd->height,
getMdpFormat(hnd->format), hnd->size);
+ if(dpy && isYuvBuffer(hnd)) {
+ if(!ctx->listStats[dpy].isDisplayAnimating) {
+ ctx->mPrevCropVideo = crop;
+ ctx->mPrevDestVideo = dst;
+ ctx->mPrevTransformVideo = transform;
+ } else {
+ // Restore the previous crop, dest rect and transform values, during
+ // animation to avoid displaying videos at random coordinates.
+ crop = ctx->mPrevCropVideo;
+ dst = ctx->mPrevDestVideo;
+ transform = ctx->mPrevTransformVideo;
+ //In you tube use case when a device rotated from landscape to
+ // portrait, set the isFg flag and zOrder to avoid displaying UI on
+ // hdmi during animation
+ if(ctx->deviceOrientation) {
+ isFg = ovutils::IS_FG_SET;
+ z = ZORDER_1;
+ }
+ }
+ }
+
+
setMdpFlags(layer, mdpFlagsL);
trimLayer(ctx, dpy, transform, crop, dst);
diff --git a/libhwcomposer/hwc_utils.h b/libhwcomposer/hwc_utils.h
index ab645bc..db5880a 100644
--- a/libhwcomposer/hwc_utils.h
+++ b/libhwcomposer/hwc_utils.h
@@ -94,6 +94,9 @@
int extOnlyLayerIndex;
bool needsAlphaScale;
bool preMultipliedAlpha;
+ // Notifies hwcomposer about the start and end of animation
+ // This will be set to true during animation, otherwise false.
+ bool isDisplayAnimating;
};
struct LayerProp {
@@ -151,7 +154,7 @@
//Sets appropriate mdp flags for a layer.
void setMdpFlags(hwc_layer_1_t *layer,
ovutils::eMdpFlags &mdpFlags,
- int rotDownscale = 0);
+ int rotDownscale = 0, int transform = 0);
int configRotator(overlay::Rotator *rot, const ovutils::Whf& whf,
const hwc_rect_t& crop, const ovutils::eMdpFlags& mdpFlags,
@@ -169,14 +172,14 @@
//Routine to configure low resolution panels (<= 2048 width)
int configureLowRes(hwc_context_t *ctx, hwc_layer_1_t *layer, const int& dpy,
- ovutils::eMdpFlags& mdpFlags, const ovutils::eZorder& z,
- const ovutils::eIsFg& isFg, const ovutils::eDest& dest,
+ ovutils::eMdpFlags& mdpFlags, ovutils::eZorder& z,
+ ovutils::eIsFg& isFg, const ovutils::eDest& dest,
overlay::Rotator **rot);
//Routine to configure high resolution panels (> 2048 width)
int configureHighRes(hwc_context_t *ctx, hwc_layer_1_t *layer, const int& dpy,
- ovutils::eMdpFlags& mdpFlags, const ovutils::eZorder& z,
- const ovutils::eIsFg& isFg, const ovutils::eDest& lDest,
+ ovutils::eMdpFlags& mdpFlags, ovutils::eZorder& z,
+ ovutils::eIsFg& isFg, const ovutils::eDest& lDest,
const ovutils::eDest& rDest, overlay::Rotator **rot);
// Inline utility functions
@@ -280,6 +283,14 @@
qhwc::MDPComp *mMDPComp[MAX_DISPLAYS];
qhwc::HwcDebug *mHwcDebug[MAX_DISPLAYS];
+ // No animation on External display feature
+ // Notifies hwcomposer about the device orientation before animation.
+ int deviceOrientation;
+ // Stores the crop, dest rect and transform value of video before animation.
+ hwc_rect_t mPrevCropVideo;
+ hwc_rect_t mPrevDestVideo;
+ int mPrevTransformVideo;
+
//Securing in progress indicator
bool mSecuring;
//External Display configuring progress indicator