From 25ee73acd2dbd6f60deef5306994fbf3a7997936 Mon Sep 17 00:00:00 2001
From: Senpo Hu <senpo@google.com>
Date: Mon, 8 Sep 2014 16:54:25 -0700
Subject: Let CameraProxy support setJpegOrientation.

When device is locked in portrait, JPEG orientation and preview
orientation might be different.

Bug: 17360176
Change-Id: I16ee937c4d930e5f02a3e703dffd3bdd63e0e367
---
 .../ex/camera2/portability/AndroidCamera2AgentImpl.java      |  8 +++++++-
 .../ex/camera2/portability/AndroidCameraAgentImpl.java       | 12 +++++++++++-
 .../com/android/ex/camera2/portability/CameraActions.java    |  1 +
 .../src/com/android/ex/camera2/portability/CameraAgent.java  | 10 ++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)

(limited to 'camera2')

diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
index 62cb700..343d517 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
@@ -493,12 +493,18 @@ class AndroidCamera2AgentImpl extends CameraAgent {
 
                     case CameraActions.SET_DISPLAY_ORIENTATION: {
                         // Only set the JPEG capture orientation if requested to do so; otherwise,
-                        // capture in the sensor's physical orientation
+                        // capture in the sensor's physical orientation. (e.g., JPEG rotation is
+                        // necessary in auto-rotate mode.
                         mPersistentSettings.set(CaptureRequest.JPEG_ORIENTATION, msg.arg2 > 0 ?
                                 mCameraProxy.getCharacteristics().getJpegOrientation(msg.arg1) : 0);
                         break;
                     }
 
+                    case CameraActions.SET_JPEG_ORIENTATION: {
+                        mPersistentSettings.set(CaptureRequest.JPEG_ORIENTATION, msg.arg1);
+                        break;
+                    }
+
                     case CameraActions.CAPTURE_PHOTO: {
                         if (mCameraState.getState() <
                                         AndroidCamera2StateHolder.CAMERA_PREVIEW_ACTIVE) {
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
index 949ac62..d3ddb3e 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
@@ -472,11 +472,21 @@ class AndroidCameraAgentImpl extends CameraAgent {
                         mCamera.setDisplayOrientation(
                                 mCharacteristics.getPreviewOrientation(msg.arg1));
                         // Only set the JPEG capture orientation if requested to do so; otherwise,
-                        // capture in the sensor's physical orientation
+                        // capture in the sensor's physical orientation. (e.g., JPEG rotation is
+                        // necessary in auto-rotate mode.
                         Parameters parameters = mParameterCache.getBlocking();
                         parameters.setRotation(
                                 msg.arg2 > 0 ? mCharacteristics.getJpegOrientation(msg.arg1) : 0);
                         mCamera.setParameters(parameters);
+                        mParameterCache.invalidate();
+                        break;
+                    }
+
+                    case CameraActions.SET_JPEG_ORIENTATION: {
+                        Parameters parameters = mParameterCache.getBlocking();
+                        parameters.setRotation(msg.arg1);
+                        mCamera.setParameters(parameters);
+                        mParameterCache.invalidate();
                         break;
                     }
 
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java
index aae122b..a7f3c35 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java
@@ -50,6 +50,7 @@ class CameraActions {
     // Presentation
     public static final int ENABLE_SHUTTER_SOUND =    501;
     public static final int SET_DISPLAY_ORIENTATION = 502;
+    public static final int SET_JPEG_ORIENTATION = 503;
     // Capture
     public static final int CAPTURE_PHOTO = 601;
 }
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
index b624b47..c1b2e8f 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
@@ -672,6 +672,16 @@ public abstract class CameraAgent {
                 }});
         }
 
+        public void setJpegOrientation(final int degrees) {
+            getDispatchThread().runJob(new Runnable() {
+                @Override
+                public void run() {
+                    getCameraHandler()
+                            .obtainMessage(CameraActions.SET_JPEG_ORIENTATION, degrees, 0)
+                            .sendToTarget();
+                }});
+        }
+
         /**
          * Sets the listener for zoom change.
          *
-- 
cgit v1.2.3