commit e606d7b14999328c8851dd373ba3129d3c15562b
author Linux Build Service Account <lnxbuild@localhost> Mon Jun 16 23:36:54 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jun 16 23:36:54 2014 -0700
tree da9d8d8c2c821dba1724088427371be22bc301ee
parent 3063fca48e68f7627320d6bd4017f9b2c2ca8350
parent e28a402b7242196708d63f547b4d61f70b32ad44

Merge "hwc: On downscale check swap on 90 transform"

libhwcomposer/hwc_mdpcomp.cpp

diff --git a/libhwcomposer/hwc_mdpcomp.cpp b/libhwcomposer/hwc_mdpcomp.cpp
index cf68a3a..b0953da 100644
--- a/libhwcomposer/hwc_mdpcomp.cpp
+++ b/libhwcomposer/hwc_mdpcomp.cpp
@@ -347,8 +347,9 @@
 
     hwc_rect_t crop = integerizeSourceCrop(layer->sourceCropf);
     hwc_rect_t dst = layer->displayFrame;
-    int crop_w = crop.right - crop.left;
-    int crop_h = crop.bottom - crop.top;
+    bool rotated90 = (bool)layer->transform & HAL_TRANSFORM_ROT_90;
+    int crop_w = rotated90 ? crop.bottom - crop.top : crop.right - crop.left;
+    int crop_h = rotated90 ? crop.right - crop.left : crop.bottom - crop.top;
     int dst_w = dst.right - dst.left;
     int dst_h = dst.bottom - dst.top;
     float w_scale = ((float)crop_w / (float)dst_w);