commit 5fedaffddebd6b37f09cdc9804812945b9622498
author Eino-Ville Talvala <etalvala@google.com> Tue Jul 29 19:01:19 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 25 23:00:08 2014 +0000
tree ac2353003ed6346cdf181eee673bd341bc2a016e
parent f0a3c16901a7d9455f5d3153f6240e73e57a7beb
parent 0ccba97ebec0e0c5a20f8859ebac03d5fd14c97f

Merge "Camera2: Fix transforms for front-facing cameras" into lmp-dev

camera/CameraUtils.cpp

diff --git a/camera/CameraUtils.cpp b/camera/CameraUtils.cpp
index 3ff181d..1ff63ab 100644
--- a/camera/CameraUtils.cpp
+++ b/camera/CameraUtils.cpp
@@ -73,18 +73,25 @@
                 return INVALID_OPERATION;
         }
     } else {
+        // Front camera needs to be horizontally flipped for
+        // mirror-like behavior.
+        // Note: Flips are applied before rotates.
         switch (orientation) {
             case 0:
-                flags = HAL_TRANSFORM_FLIP_H;
+                flags = NATIVE_WINDOW_TRANSFORM_FLIP_H;
                 break;
             case 90:
-                flags = HAL_TRANSFORM_FLIP_H | HAL_TRANSFORM_ROT_90;
+                flags = NATIVE_WINDOW_TRANSFORM_FLIP_H |
+                        NATIVE_WINDOW_TRANSFORM_ROT_270;
                 break;
             case 180:
-                flags = HAL_TRANSFORM_FLIP_V;
+                flags = NATIVE_WINDOW_TRANSFORM_FLIP_H |
+                        NATIVE_WINDOW_TRANSFORM_ROT_180;
                 break;
             case 270:
-                flags = HAL_TRANSFORM_FLIP_V | HAL_TRANSFORM_ROT_90;
+                flags = NATIVE_WINDOW_TRANSFORM_FLIP_H |
+                        NATIVE_WINDOW_TRANSFORM_ROT_90;
+
                 break;
             default:
                 ALOGE("%s: Invalid HAL android.sensor.orientation value: %d",