SnapdragonCamera: Pass device mount orientation to Clearsight JNI

1. Add persist system property to config device mount orientation
2. Pass device mount orientation to Clearsight JNI
3. Recalculate the size of the buffer YUV.

CRs-Fixed: 2039320
Change-Id: Ie3c13ccd3d261df4cad310aa6235f548263b3ca1

3 files changed, 52 insertions, 11 deletions

diff --git a/src/com/android/camera/util/PersistUtil.java b/src/com/android/camera/util/PersistUtil.java
index 89c58131a..3b80a9b2e 100644
--- a/src/com/android/camera/util/PersistUtil.java
+++ b/src/com/android/camera/util/PersistUtil.java
@@ -32,6 +32,13 @@ import android.os.SystemProperties;
 
 public class PersistUtil {
 
+    public static final int CAMERA2_DEBUG_DUMP_IMAGE = 1;
+    public static final int CAMERA2_DEBUG_DUMP_LOG = 2;
+    public static final int CAMERA2_DEBUG_DUMP_ALL = 100;
+
+    private static final int CAMERA_SENSOR_HORIZONTAL_ALIGNED = 0;
+    private static final int CAMERA_SENSOR_VERTICAL_ALIGNED = 1;
+
     private static final int PERSIST_MEMORY_LIMIT =
             SystemProperties.getInt("persist.vendor.camera.perf.memlimit", 60);
     private static final boolean PERSIST_SKIP_MEMORY_CHECK =
@@ -58,11 +65,13 @@ public class PersistUtil {
             SystemProperties.get("persist.vendor.camera.stm_smooth", "0");
     private static final int PERSIST_CAMERA_STILLMORE_NUM_REQUIRED_IMAGE =
             SystemProperties.getInt("persist.vendor.camera.stm_img_nums", 5);
-
-
-    public static final int CAMERA2_DEBUG_DUMP_IMAGE = 1;
-    public static final int CAMERA2_DEBUG_DUMP_LOG = 2;
-    public static final int CAMERA2_DEBUG_DUMP_ALL = 100;
+    private static final String PERSIST_CAMERA_CS_BRINTENSITY_KEY =
+            SystemProperties.get("persist.vendor.camera.sensor.brinten", "0.0");
+    private static final String PERSIST_CAMERA_CS_SMOOTH_KEY =
+            SystemProperties.get("persist.vendor.camera.sensor.smooth", "0.5");
+    private static final int PERSIST_CAMERA_SENSOR_ALIGN_KEY =
+            SystemProperties.getInt("persist.vendor.camera.sensor.align",
+                    CAMERA_SENSOR_HORIZONTAL_ALIGNED);
 
     public static int getMemoryLimit() {
         return PERSIST_MEMORY_LIMIT;
@@ -117,4 +126,16 @@ public class PersistUtil {
     public static int getCancelTouchFocusDelay() {
         return PERSIST_CAMERA_CANCEL_TOUCHFOCUS_DELAY;
     }
+
+    public static float getDualCameraBrIntensity() {
+        return Float.parseFloat(PERSIST_CAMERA_CS_BRINTENSITY_KEY);
+    }
+
+    public static float getDualCameraSmoothingIntensity() {
+        return Float.parseFloat(PERSIST_CAMERA_CS_SMOOTH_KEY);
+    }
+
+    public static boolean getDualCameraSensorAlign() {
+        return PERSIST_CAMERA_SENSOR_ALIGN_KEY == CAMERA_SENSOR_VERTICAL_ALIGNED;
+    }
 }
diff --git a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java
index b2a81389d..f26caf717 100644
--- a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java
+++ b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java
@@ -1543,11 +1543,14 @@ public class ClearSightImageProcessor {
         ByteBuffer vuBuffer = planes[2].getBuffer();
         int sizeY = yBuffer.capacity();
         int sizeVU = vuBuffer.capacity();
-        byte[] data = new byte[sizeY + sizeVU];
+        int stride = image.getPlanes()[0].getRowStride();
+        int height = image.getHeight();
+        byte[] data = new byte[stride * height*3/2];
         yBuffer.rewind();
         yBuffer.get(data, 0, sizeY);
         vuBuffer.rewind();
         vuBuffer.get(data, sizeY, sizeVU);
+
         int[] strides = new int[] { planes[0].getRowStride(),
                 planes[2].getRowStride() };
 
diff --git a/src/org/codeaurora/snapcam/filter/ClearSightNativeEngine.java b/src/org/codeaurora/snapcam/filter/ClearSightNativeEngine.java
index 8b30ca032..5ba0fd951 100644
--- a/src/org/codeaurora/snapcam/filter/ClearSightNativeEngine.java
+++ b/src/org/codeaurora/snapcam/filter/ClearSightNativeEngine.java
@@ -41,8 +41,12 @@ import android.media.Image;
 import android.media.Image.Plane;
 import android.util.Log;
 
+import com.android.camera.util.PersistUtil;
+
 public class ClearSightNativeEngine {
-    private static final boolean DEBUG = false;
+    private static final boolean DEBUG =
+            (PersistUtil.getCamera2Debug() == PersistUtil.CAMERA2_DEBUG_DUMP_LOG) ||
+            (PersistUtil.getCamera2Debug() == PersistUtil.CAMERA2_DEBUG_DUMP_ALL);
     private static final String TAG = "ClearSightNativeEngine";
     static {
         try {
@@ -75,8 +79,14 @@ public class ClearSightNativeEngine {
     private ArrayList<SourceImage> mCache = new ArrayList<SourceImage>();
     private ArrayList<SourceImage> mSrcColor = new ArrayList<SourceImage>();
     private ArrayList<SourceImage> mSrcMono = new ArrayList<SourceImage>();
+    private final float mBrIntensity;
+    private final float mSmoothingIntensity;
+    private final boolean mIsVerticallyAlignedSensor;
 
     private ClearSightNativeEngine() {
+        mBrIntensity = PersistUtil.getDualCameraBrIntensity();
+        mSmoothingIntensity = PersistUtil.getDualCameraSmoothingIntensity();
+        mIsVerticallyAlignedSensor = PersistUtil.getDualCameraSensorAlign();
     }
 
     public static void createInstance() {
@@ -296,10 +306,16 @@ public class ClearSightNativeEngine {
         exposure /= 100000;
 
         Log.d(TAG, "processImage - iso: " + iso + " exposure ms: " + exposure);
-        return nativeClearSightProcessInit(numImages,
+        if (DEBUG) {
+            Log.d(TAG,"processImage - mBrIntensity :" + mBrIntensity +
+                    ", mSmoothingIntensity :" + mSmoothingIntensity +
+                    ", mIsVerticallyAlignedSensor :" + mIsVerticallyAlignedSensor);
+        }
+        return nativeClearSightProcessInit2(numImages,
                 srcColorY, srcColorVU, metadataColor, mImageWidth, mImageHeight,
                 mYStride, mVUStride, srcMonoY, metadataMono, mImageWidth, mImageHeight,
-                mYStride, mOtpCalibData, (int)exposure, iso);
+                mYStride, mOtpCalibData, (int)exposure, iso,
+                mBrIntensity, mSmoothingIntensity, mIsVerticallyAlignedSensor);
     }
 
     public boolean processImage(ClearsightImage csImage) {
@@ -326,12 +342,13 @@ public class ClearSightNativeEngine {
             int strideY, int strideVU, ByteBuffer dstY, ByteBuffer dstVU,
             float[] metadata);
 
-    private native final boolean nativeClearSightProcessInit(int numImagePairs,
+    private native final boolean nativeClearSightProcessInit2(int numImagePairs,
             ByteBuffer[] srcColorY, ByteBuffer[] srcColorVU,
             float[][] metadataColor, int srcColorWidth, int srcColorHeight,
             int srcColorStrideY, int srcColorStrideVU, ByteBuffer[] srcMonoY,
             float[][] metadataMono, int srcMonoWidth, int srcMonoHeight,
-            int srcMonoStrideY, byte[] otp, int exposureMs, int iso);
+            int srcMonoStrideY, byte[] otp, int exposureMs, int iso,
+            float brIntensity, float smoothingIntensity, boolean isVerticallyAlignedSensor);
 
     private native final boolean nativeClearSightProcess(ByteBuffer dstY,
             ByteBuffer dstVU, int dstStrideY, int dstStrideVU, int[] roiRect);