commit 8557548cfbac61c7257aa01fbd578439869bcc68
author Linux Build Service Account <lnxbuild@localhost> Fri Mar 06 23:41:39 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Mar 06 23:41:39 2015 -0800
tree ab9b1c990547293f1e8f218712e5c459eec54082
parent ccbe5a4fc8ad4ea7b7c2b4501c4ea131bd1f8b1e
parent d5b369f320fb8fbc0d23d6b49f91088cd596db9f

Merge "hwc: Handle alpha scaling in mdp3."

libhwcomposer/hwc_copybit.cpp

diff --git a/libhwcomposer/hwc_copybit.cpp b/libhwcomposer/hwc_copybit.cpp
index 68f168a..3297317 100644
--- a/libhwcomposer/hwc_copybit.cpp
+++ b/libhwcomposer/hwc_copybit.cpp
@@ -354,10 +354,18 @@
             dx = (float)dst_w/(float)src_w;
             dy = (float)dst_h/(float)src_h;
 
-            if (dx > MAX_SCALE_FACTOR || dx < MIN_SCALE_FACTOR)
+            float scale_factor_max = MAX_SCALE_FACTOR;
+            float scale_factor_min = MIN_SCALE_FACTOR;
+
+            if (isAlphaPresent(layer)) {
+               scale_factor_max = MAX_SCALE_FACTOR/4;
+               scale_factor_min = MIN_SCALE_FACTOR*4;
+            }
+
+            if (dx > scale_factor_max || dx < scale_factor_min)
                 return false;
 
-            if (dy > MAX_SCALE_FACTOR || dy < MIN_SCALE_FACTOR)
+            if (dy > scale_factor_max || dy < scale_factor_min)
                 return false;
         }
     }