Merge tag 'camera.lnx.2.0-00010' into camera.lnx.3.0-dev

Merge tag 'camera.lnx.2.0-00010' into camera.lnx.3.0-dev

Change-Id: I7e8e12e01f16093e1bda744de511c29e1ec26570

2 files changed, 12 insertions, 1 deletions

diff --git a/src/com/android/camera/imageprocessor/PostProcessor.java b/src/com/android/camera/imageprocessor/PostProcessor.java
index 5513b69bb..b78852182 100644
--- a/src/com/android/camera/imageprocessor/PostProcessor.java
+++ b/src/com/android/camera/imageprocessor/PostProcessor.java
@@ -673,6 +673,7 @@ public class PostProcessor{
         mSaveRaw = isSaveRaw;
         if(setFilter(postFilterId) || isFlashModeOn || isTrackingFocusOn || isMakeupOn || isSelfieMirrorOn
                 || PersistUtil.getCameraZSLDisabled()
+                || "disable".equals(SettingsManager.getInstance().getValue(SettingsManager.KEY_ZSL))
                 || "enable".equals(
                          SettingsManager.getInstance().getValue(SettingsManager.KEY_AUTO_HDR))
                 || SettingsManager.getInstance().isCamera2HDRSupport()
diff --git a/src/com/android/camera/imageprocessor/filter/StillmoreFilter.java b/src/com/android/camera/imageprocessor/filter/StillmoreFilter.java
index 2f483bfdc..34784faa0 100644
--- a/src/com/android/camera/imageprocessor/filter/StillmoreFilter.java
+++ b/src/com/android/camera/imageprocessor/filter/StillmoreFilter.java
@@ -38,13 +38,14 @@ import android.util.Log;
 import android.util.Range;
 
 import com.android.camera.CaptureModule;
+import com.android.camera.util.PersistUtil;
 
 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;
+    public static final int NUM_REQUIRED_IMAGE = PersistUtil.getStillmoreNumRequiredImages();
     private int mWidth;
     private int mHeight;
     private int mStrideY;
@@ -99,6 +100,13 @@ public class StillmoreFilter implements ImageFilter{
         Log("width: "+mWidth+" height: "+mHeight+" strideY: "+mStrideY+" strideVU: "+mStrideVU);
         nativeInit(mWidth, mHeight, mStrideY, mStrideVU,
                 0, 0, mWidth, mHeight, NUM_REQUIRED_IMAGE);
+        float brColor = PersistUtil.getStillmoreBrColor();
+        float brIntensity = PersistUtil.getStillmoreBrIntensity();
+        float smoothingintensity = PersistUtil.getStillmoreSmoothingIntensity();
+        nativeConfigureStillMore(brColor, brIntensity, smoothingintensity);
+        Log("ConfigureStillmore brColor: " + brColor + " brIntensity: " +
+                brIntensity + " smoothingintensity: " + smoothingintensity +
+                " NUM_REQUIRED_IMAGE: " + NUM_REQUIRED_IMAGE);
     }
 
     @Override
@@ -156,6 +164,8 @@ public class StillmoreFilter implements ImageFilter{
         return mIsSupported;
     }
 
+    private native int nativeConfigureStillMore(float brColor, float brIntensity,
+                                                float smoothingintensity);
     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();