ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am b3abe7c0: Merge "Incorporate TransformToDisplayInverse into the crop calculation." into lmp-dev

Browse Source 
* commit 'b3abe7c06a834d92439d034b29e3b5af632de130':
  Incorporate TransformToDisplayInverse into the crop calculation.
This commit is contained in:
Michael Lentine 2014-08-19 21:13:00 +00:00 committed by Android Git Automerger
commit 1b20b8e694
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
services/surfaceflinger/Layer.cpp
View File

@ -323,6 +323,20 @@ FloatRect Layer::computeCrop(const sp<const DisplayDevice>& hw) const {
// which means using the inverse of the current transform set on the // which means using the inverse of the current transform set on the
// SurfaceFlingerConsumer. // SurfaceFlingerConsumer.
uint32_t invTransform = mCurrentTransform; uint32_t invTransform = mCurrentTransform;
if (mSurfaceFlingerConsumer->getTransformToDisplayInverse()) {
/*
* the code below applies the display's inverse transform to the buffer
*/
uint32_t invTransformOrient = hw->getOrientationTransform();
// calculate the inverse transform
if (invTransformOrient & NATIVE_WINDOW_TRANSFORM_ROT_90) {
invTransformOrient ^= NATIVE_WINDOW_TRANSFORM_FLIP_V |
NATIVE_WINDOW_TRANSFORM_FLIP_H;
}
// and apply to the current transform
invTransform = (Transform(invTransform) * Transform(invTransformOrient)).getOrientation();
}
int winWidth = s.active.w; int winWidth = s.active.w;
int winHeight = s.active.h; int winHeight = s.active.h;
if (invTransform & NATIVE_WINDOW_TRANSFORM_ROT_90) { if (invTransform & NATIVE_WINDOW_TRANSFORM_ROT_90) {
@ -332,16 +346,16 @@ FloatRect Layer::computeCrop(const sp<const DisplayDevice>& hw) const {
winHeight = s.active.w; winHeight = s.active.w;
} }
const Rect winCrop = activeCrop.transform( const Rect winCrop = activeCrop.transform(
invTransform, winWidth, winHeight); invTransform, s.active.w, s.active.h);
// below, crop is intersected with winCrop expressed in crop's coordinate space // below, crop is intersected with winCrop expressed in crop's coordinate space
float xScale = crop.getWidth() / float(winWidth); float xScale = crop.getWidth() / float(winWidth);
float yScale = crop.getHeight() / float(winHeight); float yScale = crop.getHeight() / float(winHeight);
float insetL = winCrop.left * xScale; float insetL = winCrop.left * xScale;
float insetT = winCrop.top * yScale; float insetT = winCrop.top * yScale;
float insetR = (s.active.w - winCrop.right ) * xScale; float insetR = (winWidth - winCrop.right ) * xScale;
float insetB = (s.active.h - winCrop.bottom) * yScale; float insetB = (winHeight - winCrop.bottom) * yScale;
crop.left += insetL; crop.left += insetL;
crop.top += insetT; crop.top += insetT;