commit f0df31ab76bfb194c4d26ef1cd4278437bbd4999
author Sascha Haeberling <haeberling@google.com> Fri Oct 03 18:48:23 2014 -0700
committer Sascha Haeberling <haeberling@google.com> Fri Oct 03 18:48:23 2014 -0700
tree d16cd2a52610486a7da007eebe28a39791b7412b
parent 2605e4b11c983071383c421d939dbc51670c8de8

[CtsVerifier] Fix Shamu front-facing camera orientation.

  Bug: 17672809

Change-Id: I72b866f6f32c2b2f68aa1b17d249757e3e25ce49

apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java
index 05013ed..d71dca2 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java
@@ -30,6 +30,7 @@
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
+import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
@@ -426,6 +427,7 @@
 
     private void startPreview() {
         if (mCameraInitialized && mCamera != null) {
+            setCameraDisplayOrientation(this, mCameraId, mCamera);
             mCamera.startPreview();
             mPreviewActive = true;
         }
@@ -501,4 +503,29 @@
         }
         return result;
     }
+
+    public static void setCameraDisplayOrientation(Activity activity,
+            int cameraId, android.hardware.Camera camera) {
+        android.hardware.Camera.CameraInfo info =
+                new android.hardware.Camera.CameraInfo();
+        android.hardware.Camera.getCameraInfo(cameraId, info);
+        int rotation = activity.getWindowManager().getDefaultDisplay()
+                .getRotation();
+        int degrees = 0;
+        switch (rotation) {
+            case Surface.ROTATION_0: degrees = 0; break;
+            case Surface.ROTATION_90: degrees = 90; break;
+            case Surface.ROTATION_180: degrees = 180; break;
+            case Surface.ROTATION_270: degrees = 270; break;
+        }
+
+        int result;
+        if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+            result = (info.orientation + degrees) % 360;
+            result = (360 - result) % 360;  // compensate the mirror
+        } else {  // back-facing
+            result = (info.orientation - degrees + 360) % 360;
+        }
+        camera.setDisplayOrientation(result);
+    }
 }