SnapdragonCamera: SelfieMirror Camera2

SelfieMirror filter for camera2.

Change-Id: Id5fda369a56421199a8c2537491608b8667fb77e
CRs-Fixed: 1071798

1 files changed, 11 insertions, 9 deletions

diff --git a/src/com/android/camera/imageprocessor/filter/BeautificationFilter.java b/src/com/android/camera/imageprocessor/filter/BeautificationFilter.java
index c9c559d3e..ec60db749 100644
--- a/src/com/android/camera/imageprocessor/filter/BeautificationFilter.java
+++ b/src/com/android/camera/imageprocessor/filter/BeautificationFilter.java
@@ -56,17 +56,11 @@ public class BeautificationFilter implements ImageFilter {
     private static boolean DEBUG = false;
     private static String TAG = "BeautificationFilter";
     private static boolean mIsSupported = false;
-    private int mStrengthValue = 0;
     private static int FACE_TIMEOUT_VALUE = 60; //in frame count
     private int mFaceTimeOut = FACE_TIMEOUT_VALUE;
 
     public BeautificationFilter(CaptureModule module) {
         mModule = module;
-        String value = SettingsManager.getInstance().getValue(SettingsManager.KEY_MAKEUP);
-        try {
-            mStrengthValue = Integer.parseInt(value);
-        } catch(Exception e) {
-        }
     }
 
     @Override
@@ -120,18 +114,26 @@ public class BeautificationFilter implements ImageFilter {
             return;
         }
         Rect rect = faces[0].getBounds();
+        int strengthValue = 100;
+        try {
+            String str = SettingsManager.getInstance().getValue(SettingsManager.KEY_MAKEUP);
+            strengthValue = Integer.parseInt(str);
+        } catch(Exception e) {
+        }
         int value = nativeBeautificationProcess(bY, bVU, mWidth, mHeight, mStrideY,
                 (int)(rect.left*widthRatio), (int)(rect.top*heightRatio),
-                (int)(rect.right*widthRatio), (int)(rect.bottom*heightRatio), mStrengthValue, mStrengthValue);
+                (int)(rect.right*widthRatio), (int)(rect.bottom*heightRatio), strengthValue, strengthValue);
         if(DEBUG) {
             if(value == -1) {
                 Log.d(TAG, "library initialization is failed.");
             } else if(value == -2) {
                 Log.d(TAG, "No face is recognized");
-            } else if(value >= 0 && !((Boolean)isPreview).booleanValue()){
-                Log.d(TAG, "Successful beautification");
             }
         }
+        if(value >= 0 && !((Boolean)isPreview).booleanValue()){
+            Log.i(TAG, "Successful beautification at "+faces[0].toString()+
+                    " widthRatio: "+widthRatio+" heightRatio: "+ heightRatio+" Strength: "+strengthValue);
+        }
     }
 
     @Override