Merge "Gallery2: update to ddm lib version 2.4.2" into ui_dev_2.0

6 files changed, 18 insertions, 113 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
index f1e7e6c26..ba6fff382 100644
--- a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
+++ b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
@@ -376,32 +376,29 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface {
     public void addDualCam(Context context) {
         int[] textId = {
                 R.string.focus,
-                R.string.halo,
-                R.string.blur
+                R.string.halo
         };
 
         int[] overlayId = {
                 R.drawable.filtershow_dualcam_focus,
-                R.drawable.filtershow_dualcam_halo,
-                R.drawable.filtershow_dualcam_blur
+                R.drawable.filtershow_dualcam_halo
         };
 
         String[] serializationNames = {
                 "DUAL_CAM_FOCUS",
-                "DUAL_CAM_HALO",
-                "DUAL_CAM_BLUR"
+                "DUAL_CAM_HALO"
         };
 
         // intensity range as defined by ddm lib
         int[][] minMaxValues = {
                 {0,5,10},
-                {0,3,7},
-                {0,4,9}
+                {0,5,10}
         };
 
         FilterDualCamSketchRepresentation none =
-                new FilterDualCamSketchRepresentation(context.getString(R.string.none), 0, 0);
+                new FilterDualCamSketchRepresentation(context.getString(R.string.none), R.string.none);
         none.setEditorId(ImageOnlyEditor.ID);
+        none.setSerializationName("DUAL_CAM_NONE");
         mDualCam.add(none);
 
         for (int i = 0; i < textId.length; i++) {
@@ -417,7 +414,7 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface {
         }
 
         FilterDualCamSketchRepresentation sketch = new FilterDualCamSketchRepresentation(
-                context.getString(R.string.sketch), R.string.sketch, R.raw.sketch);
+                context.getString(R.string.sketch), R.string.sketch);
         sketch.setOverlayId(R.drawable.filtershow_dualcam_sketch);
         sketch.setOverlayOnly(true);
         sketch.setSerializationName("DUAL_CAM_SKETCH");
@@ -443,7 +440,5 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface {
         filterBorder.setResources(resources);
         ImageFilterFx filterFx = (ImageFilterFx) getFilter(ImageFilterFx.class);
         filterFx.setResources(resources);
-        ImageFilterDualCamSketch filterSketch = (ImageFilterDualCamSketch) getFilter(ImageFilterDualCamSketch.class);
-        filterSketch.setResources(resources);
     }
 }
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterDualCamSketchRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterDualCamSketchRepresentation.java
index 92b3f156b..6acf2d3ab 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterDualCamSketchRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterDualCamSketchRepresentation.java
@@ -35,58 +35,25 @@ import com.android.gallery3d.filtershow.editors.EditorDualCamSketch;
 public class FilterDualCamSketchRepresentation extends FilterDualCamBasicRepresentation {
     private static final String LOGTAG = "FilterDualCamSketchRepresentation";
 
-    private int mSketchResource = 0;
-
-    public FilterDualCamSketchRepresentation(String name, int nameResId, int sketchResId) {
+    public FilterDualCamSketchRepresentation(String name, int nameResId) {
         super(name, 0, 0, 0);
         setFilterType(FilterRepresentation.TYPE_DUALCAM);
         setFilterClass(ImageFilterDualCamSketch.class);
         setEditorId(EditorDualCamSketch.ID);
         setTextId(nameResId);
         setShowParameterValue(false);
-        mSketchResource = sketchResId;
     }
 
     @Override
     public FilterRepresentation copy() {
         FilterDualCamSketchRepresentation representation =
-                new FilterDualCamSketchRepresentation(getName(), 0, 0);
+                new FilterDualCamSketchRepresentation(getName(), 0);
         copyAllParameters(representation);
         return representation;
     }
 
-    public void useParametersFrom(FilterRepresentation a) {
-        super.useParametersFrom(a);
-        if (a instanceof FilterDualCamSketchRepresentation) {
-            FilterDualCamSketchRepresentation representation = (FilterDualCamSketchRepresentation) a;
-            setSketchResId(representation.getSketchResId());
-        }
-    }
-
-    @Override
-    public boolean equals(FilterRepresentation representation) {
-        if (!super.equals(representation)) {
-            return false;
-        }
-        if (representation instanceof FilterDualCamSketchRepresentation) {
-            FilterDualCamSketchRepresentation dualCam = (FilterDualCamSketchRepresentation) representation;
-            if (dualCam.getSketchResId() == mSketchResource) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void setSketchResId(int bmResource) {
-        mSketchResource = bmResource;
-    }
-
-    public int getSketchResId() {
-        return mSketchResource;
-    }
-
     @Override
     public String toString() {
-        return "dualcam - point: " + getPoint().toString() + ", sketchResId: " + mSketchResource;
+        return "dualcam - point: " + getPoint().toString();
     }
 }
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamSketch.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamSketch.java
index 3f12982a8..6907fe394 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamSketch.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamSketch.java
@@ -29,9 +29,7 @@
 
 package com.android.gallery3d.filtershow.filters;
 
-import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Paint;
@@ -52,9 +50,6 @@ public class ImageFilterDualCamSketch extends ImageFilter {
 
     private FilterDualCamSketchRepresentation mParameters;
     private Paint mPaint = new Paint();
-    private Bitmap mSketchBm = null;
-    private int mSketchResId = 0;
-    private Resources mResources = null;
 
     public FilterRepresentation getDefaultRepresentation() {
         return null;
@@ -69,19 +64,6 @@ public class ImageFilterDualCamSketch extends ImageFilter {
         return mParameters;
     }
 
-    public void setResources(Resources resources) {
-        mResources = resources;
-    }
-
-    @Override
-    public void freeResources() {
-        if (mSketchBm != null)
-            mSketchBm.recycle();
-
-        mSketchBm = null;
-        mSketchResId = 0;
-    }
-
     @Override
     public Bitmap apply(Bitmap bitmap, float scaleFactor, int quality) {
         if (getParameters() == null) {
@@ -90,20 +72,6 @@ public class ImageFilterDualCamSketch extends ImageFilter {
 
         Point point = getParameters().getPoint();
         if(!point.equals(-1,-1)) {
-
-            int sketchResId = getParameters().getSketchResId();
-            if (sketchResId == 0) {
-                return bitmap;
-            }
-
-            if (mSketchBm == null || mSketchResId != sketchResId) {
-                loadSketchImage(sketchResId);
-            }
-
-            if (mSketchBm == null) {
-                return bitmap;
-            }
-
             boolean result = false;
             Bitmap filteredBitmap = null;
 
@@ -113,7 +81,7 @@ public class ImageFilterDualCamSketch extends ImageFilter {
 
             filteredBitmap = MasterImage.getImage().getBitmapCache().getBitmap(origW, origH, BitmapCache.FILTERS);
 
-            result = DualCameraNativeEngine.getInstance().applySketch(mSketchBm, point.x, point.y, filteredBitmap);
+            result = DualCameraNativeEngine.getInstance().applySketch(point.x, point.y, filteredBitmap);
 
             if(result == false) {
                 Log.e(TAG, "Imagelib API failed");
@@ -152,23 +120,4 @@ public class ImageFilterDualCamSketch extends ImageFilter {
 
         return bitmap;
     }
-
-    private void loadSketchImage(int sketchResId) {
-        if(mResources == null) {
-            Log.w(TAG, "resources not set");
-            return;
-        }
-
-        BitmapFactory.Options o = new BitmapFactory.Options();
-        o.inScaled = false;
-        mSketchResId = sketchResId;
-        if (mSketchResId != 0) {
-            mSketchBm = BitmapFactory.decodeResource(mResources, mSketchResId, o);
-            if(mSketchBm == null) {
-                Log.w(TAG, "could not decode sketch image");
-            }
-        } else {
-            Log.w(TAG, "bad sketch resource for filter: " + mName);
-        }
-    }
 }
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamera.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamera.java
index 2e341708f..dce31c353 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamera.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamera.java
@@ -71,7 +71,9 @@ public class ImageFilterDualCamera extends ImageFilter {
         }
 
         Point point = getParameters().getPoint();
-        int intensity = getParameters().getValue();
+        int value = getParameters().getValue();
+        int maxValue = getParameters().getMaximum();
+        float intensity = (float)value / (float)maxValue;
         Bitmap filteredBitmap = null;
 
         if(!point.equals(-1,-1)) {
@@ -93,10 +95,6 @@ public class ImageFilterDualCamera extends ImageFilter {
                 result = DualCameraNativeEngine.getInstance().applyHalo(point.x, point.y, intensity,
                         filteredBitmap);
                 break;
-            case R.string.blur:
-                result = DualCameraNativeEngine.getInstance().applyBokeh(point.x, point.y, intensity,
-                        filteredBitmap);
-                break;
             }
 
             if(result == false) {
diff --git a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
index 51eabe986..615eca9a4 100644
--- a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
@@ -462,7 +462,7 @@ public class ImagePreset {
 
     private boolean isNoneDualCamFilter(FilterRepresentation representation) {
         return representation instanceof FilterDualCamSketchRepresentation &&
-                ((FilterDualCamSketchRepresentation) representation).getSketchResId() == 0;
+                ((FilterDualCamSketchRepresentation) representation).getTextId() == R.string.none;
     }
 
     public FilterRepresentation getRepresentation(FilterRepresentation filterRepresentation) {
diff --git a/src/com/android/gallery3d/filtershow/tools/DualCameraNativeEngine.java b/src/com/android/gallery3d/filtershow/tools/DualCameraNativeEngine.java
index 7764ececb..8639d47af 100644
--- a/src/com/android/gallery3d/filtershow/tools/DualCameraNativeEngine.java
+++ b/src/com/android/gallery3d/filtershow/tools/DualCameraNativeEngine.java
@@ -80,21 +80,17 @@ public class DualCameraNativeEngine {
 
     native public boolean initDepthMap(Bitmap primaryRGBA, Bitmap auxiliaryRGBA, String mpoFilepath, String calibFilepath);
 
-    native public boolean loadDepthMap(Bitmap primaryRGBA, Bitmap depthMap);
-
     native public void releaseDepthMap();
 
     native public boolean getDepthMapSize(Point point);
 
     native public boolean getDepthMap(Bitmap dataBuffer);
 
-    native public boolean applyFocus(int focusPointX, int focusPointY, int intensity, Bitmap outBm);
-
-    native public boolean applyHalo(int focusPointX, int focusPointY, int intensity, Bitmap outBm);
+    native public boolean applyFocus(int focusPointX, int focusPointY, float intensity, Bitmap outBm);
 
-    native public boolean applyBokeh(int focusPointX, int focusPointY, int intensity, Bitmap outBm);
+    native public boolean applyHalo(int focusPointX, int focusPointY, float intensity, Bitmap outBm);
 
-    native public boolean applySketch(Bitmap sketchBm, int focusPointX, int focusPointY, Bitmap outBm);
+    native public boolean applySketch(int focusPointX, int focusPointY, Bitmap outBm);
 
     native public boolean getForegroundImg(int focusPointX, int focusPointY, Bitmap outBm);
 }