SnapdragonCamera: StillMore to camera2

Adding stillmore to camera2

Change-Id: I82bd9931168b831bf1c819935c47113f37d7a188
CRs-Fixed: 1050663

4 files changed, 186 insertions, 1 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 4edf3ab9e..cace45ba7 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -80,6 +80,7 @@ import com.android.camera.imageprocessor.FrameProcessor;
 import com.android.camera.PhotoModule.NamedImages;
 import com.android.camera.PhotoModule.NamedImages.NamedEntity;
 import com.android.camera.imageprocessor.filter.SharpshooterFilter;
+import com.android.camera.imageprocessor.filter.StillmoreFilter;
 import com.android.camera.ui.CountDownView;
 import com.android.camera.ui.ModuleSwitcher;
 import com.android.camera.ui.RotateTextToast;
@@ -1664,6 +1665,8 @@ public class CaptureModule implements CameraModule, PhotoController,
             return PostProcessor.FILTER_SHARPSHOOTER;
         } else if (mode == SettingsManager.SCENE_MODE_UBIFOCUS_INT) {
             return PostProcessor.FILTER_UBIFOCUS;
+        } else if (mode == SettingsManager.SCENE_MODE_AUTO_INT && StillmoreFilter.isSupportedStatic()) {
+            return PostProcessor.FILTER_STILLMORE;
         }
         return PostProcessor.FILTER_NONE;
     }
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 7e2e3bf6a..23c472698 100644
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -69,6 +69,8 @@ import java.util.Set;
 public class SettingsManager implements ListMenu.SettingsListener {
     public static final int RESOURCE_TYPE_THUMBNAIL = 0;
     public static final int RESOURCE_TYPE_LARGEICON = 1;
+
+    public static final int SCENE_MODE_AUTO_INT = 0;
     public static final int SCENE_MODE_NIGHT_INT = 5;
 
     // Custom-Scenemodes start from 100
diff --git a/src/com/android/camera/imageprocessor/PostProcessor.java b/src/com/android/camera/imageprocessor/PostProcessor.java
index a1cea3530..1fa908945 100644
--- a/src/com/android/camera/imageprocessor/PostProcessor.java
+++ b/src/com/android/camera/imageprocessor/PostProcessor.java
@@ -53,6 +53,7 @@ import com.android.camera.SettingsManager;
 import com.android.camera.exif.ExifInterface;
 import com.android.camera.imageprocessor.filter.OptizoomFilter;
 import com.android.camera.imageprocessor.filter.SharpshooterFilter;
+import com.android.camera.imageprocessor.filter.StillmoreFilter;
 import com.android.camera.imageprocessor.filter.UbifocusFilter;
 import com.android.camera.ui.RotateTextToast;
 
@@ -76,7 +77,8 @@ public class PostProcessor implements ImageReader.OnImageAvailableListener{
     public static final int FILTER_OPTIZOOM = 1;
     public static final int FILTER_SHARPSHOOTER = 2;
     public static final int FILTER_UBIFOCUS = 3;
-    public static final int FILTER_MAX = 4;
+    public static final int FILTER_STILLMORE = 4;
+    public static final int FILTER_MAX = 5;
 
     private int mCurrentNumImage = 0;
     private ImageFilter mFilter;
@@ -285,6 +287,9 @@ public class PostProcessor implements ImageReader.OnImageAvailableListener{
                 case FILTER_UBIFOCUS:
                     mFilter = new UbifocusFilter(mController, mActivity);
                     break;
+                case FILTER_STILLMORE:
+                    mFilter = new StillmoreFilter(mController);
+                    break;
             }
         }
 
diff --git a/src/com/android/camera/imageprocessor/filter/StillmoreFilter.java b/src/com/android/camera/imageprocessor/filter/StillmoreFilter.java
new file mode 100644
index 000000000..e5c2c03d9
--- /dev/null
+++ b/src/com/android/camera/imageprocessor/filter/StillmoreFilter.java
@@ -0,0 +1,175 @@
+/*
+Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.android.camera.imageprocessor.filter;
+
+import android.graphics.Rect;
+import android.hardware.camera2.CameraCaptureSession;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.os.Handler;
+import android.util.Log;
+import android.util.Range;
+
+import com.android.camera.CaptureModule;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+public class StillmoreFilter implements ImageFilter{
+    public static final int NUM_REQUIRED_IMAGE = 5;
+    private int mWidth;
+    private int mHeight;
+    private int mStrideY;
+    private int mStrideVU;
+    private static String TAG = "StillmoreFilter";
+    private static final boolean DEBUG = false;
+    private static boolean mIsSupported = false;
+    private ByteBuffer mOutBuf;
+    private CaptureModule mModule;
+    private int mSenseValue = 0;
+    private long mExpoTime;
+
+    private static void Log(String msg) {
+        if(DEBUG) {
+            Log.d(TAG, msg);
+        }
+    }
+
+    public StillmoreFilter(CaptureModule module) {
+        mModule = module;
+    }
+
+    @Override
+    public List<CaptureRequest> setRequiredImages(CaptureRequest.Builder builder) {
+        mExpoTime = (mModule.getPreviewCaptureResult().get(CaptureResult.SENSOR_EXPOSURE_TIME));
+        mSenseValue = (mModule.getPreviewCaptureResult().get(CaptureResult.SENSOR_SENSITIVITY)).intValue();
+
+        List<CaptureRequest> list = new ArrayList<CaptureRequest>();
+        for(int i=0; i < NUM_REQUIRED_IMAGE; i++) {
+            list.add(builder.build());
+        }
+        return list;
+    }
+
+    @Override
+    public String getStringName() {
+        return "StillmoreFilter";
+    }
+
+    @Override
+    public int getNumRequiredImage() {
+        return NUM_REQUIRED_IMAGE;
+    }
+
+    @Override
+    public void init(int width, int height, int strideY, int strideVU) {
+        Log("init");
+        mWidth = width/2*2;
+        mHeight = height/2*2;
+        mStrideY = strideY/2*2;
+        mStrideVU = strideVU/2*2;
+        mOutBuf = ByteBuffer.allocate(mStrideY*mHeight*3/2);
+        Log("width: "+mWidth+" height: "+mHeight+" strideY: "+mStrideY+" strideVU: "+mStrideVU);
+        nativeInit(mWidth, mHeight, mStrideY, mStrideVU,
+                0, 0, mWidth, mHeight, NUM_REQUIRED_IMAGE);
+    }
+
+    @Override
+    public void deinit() {
+        Log("deinit");
+        mOutBuf = null;
+        nativeDeinit();
+    }
+
+    @Override
+    public void addImage(ByteBuffer bY, ByteBuffer bVU, int imageNum, Object param) {
+        Log("addImage");
+        int yActualSize = bY.remaining();
+        int vuActualSize = bVU.remaining();
+        int status = nativeAddImage(bY, bVU, yActualSize, vuActualSize, imageNum);
+        if(status != 0) {
+            Log.e(TAG, "Fail to add image");
+        }
+    }
+
+    @Override
+    public ResultImage processImage() {
+        Log("processImage ");
+        int[] roi = new int[4];
+        int status = nativeProcessImage(mOutBuf.array(), (int) (mExpoTime / 1000000), mSenseValue, roi);
+        Log("processImage done");
+        if(status < 0) { //In failure case, library will return the first image as it is.
+            Log.w(TAG, "Fail to process the image.");
+        }
+        return new ResultImage(mOutBuf, new Rect(roi[0], roi[1], roi[0]+roi[2], roi[1] + roi[3]), mWidth, mHeight, mStrideY);
+    }
+
+    @Override
+    public boolean isSupported() {
+        return mIsSupported;
+    }
+
+    @Override
+    public boolean isFrameListener() {
+        return false;
+    }
+
+    @Override
+    public boolean isManualMode() {
+        return false;
+    }
+
+    @Override
+    public void manualCapture(CaptureRequest.Builder builder, CameraCaptureSession captureSession,
+                              CameraCaptureSession.CaptureCallback callback, Handler handler) {
+
+    }
+
+    public static boolean isSupportedStatic() {
+        return mIsSupported;
+    }
+
+    private native int nativeInit(int width, int height, int yStride, int vuStride,
+                                   int roiX, int roiY, int roiW, int roiH, int numImages);
+    private native int nativeDeinit();
+    private native int nativeAddImage(ByteBuffer yB, ByteBuffer vuB, int ySize, int vuSize, int imageNum);
+    private native int nativeProcessImage(byte[] buffer, int expoTime, int isoValue, int[] roi);
+
+    static {
+        try {
+            System.loadLibrary("jni_stillmore");
+            mIsSupported = true;
+        }catch(UnsatisfiedLinkError e) {
+            Log.d(TAG, e.toString());
+            mIsSupported = false;
+        }
+    }
+}