Implements Redeye fix

bug:7223838
Change-Id: I21d8d2c8f858fca2e86d18b927cbf6878eb64263

7 files changed, 344 insertions, 19 deletions

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 56e60ed5e..a73f44353 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -72,6 +72,7 @@ import com.android.gallery3d.filtershow.filters.ImageFilterWBalance;
 import com.android.gallery3d.filtershow.imageshow.ImageBorder;
 import com.android.gallery3d.filtershow.imageshow.ImageCrop;
 import com.android.gallery3d.filtershow.imageshow.ImageFlip;
+import com.android.gallery3d.filtershow.imageshow.ImageRedEyes;
 import com.android.gallery3d.filtershow.imageshow.ImageRotate;
 import com.android.gallery3d.filtershow.imageshow.ImageShow;
 import com.android.gallery3d.filtershow.imageshow.ImageSmallBorder;
@@ -105,6 +106,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
     private ImageShow mImageShow = null;
     private ImageCurves mImageCurves = null;
     private ImageBorder mImageBorders = null;
+    private ImageRedEyes mImageRedEyes = null;
     private ImageStraighten mImageStraighten = null;
     private ImageZoom mImageZoom = null;
     private ImageCrop mImageCrop = null;
@@ -205,6 +207,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         mImageRotate = (ImageRotate) findViewById(R.id.imageRotate);
         mImageFlip = (ImageFlip) findViewById(R.id.imageFlip);
         mImageTinyPlanet = (ImageTinyPlanet) findViewById(R.id.imageTinyPlanet);
+        mImageRedEyes = (ImageRedEyes) findViewById(R.id.imageRedEyes);
 
         mImageCrop.setAspectTextSize((int) getPixelsFromDip(18));
         ImageCrop.setTouchTolerance((int) getPixelsFromDip(25));
@@ -218,6 +221,10 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         mImageViews.add(mImageRotate);
         mImageViews.add(mImageFlip);
         mImageViews.add(mImageTinyPlanet);
+        mImageViews.add(mImageRedEyes);
+        for (ImageShow imageShow : mImageViews) {
+            mImageLoader.addCacheListener(imageShow);
+        }
 
         mListFx = findViewById(R.id.fxList);
         mListBorders = findViewById(R.id.bordersList);
@@ -252,6 +259,8 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         mImageFlip.setMaster(mImageShow);
         mImageTinyPlanet.setImageLoader(mImageLoader);
         mImageTinyPlanet.setMaster(mImageShow);
+        mImageRedEyes.setImageLoader(mImageLoader);
+        mImageRedEyes.setMaster(mImageShow);
 
         mPanelController.setActivity(this);
 
@@ -264,6 +273,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         mPanelController.addImageView(findViewById(R.id.imageFlip));
         mPanelController.addImageView(findViewById(R.id.imageZoom));
         mPanelController.addImageView(findViewById(R.id.imageTinyPlanet));
+        mPanelController.addImageView(findViewById(R.id.imageRedEyes));
 
         mPanelController.addPanel(mFxButton, mListFx, 0);
         mPanelController.addPanel(mBorderButton, mListBorders, 1);
@@ -273,6 +283,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         mPanelController.addComponent(mGeometryButton, findViewById(R.id.cropButton));
         mPanelController.addComponent(mGeometryButton, findViewById(R.id.rotateButton));
         mPanelController.addComponent(mGeometryButton, findViewById(R.id.flipButton));
+        mPanelController.addComponent(mGeometryButton, findViewById(R.id.redEyeButton));
 
         mPanelController.addPanel(mColorsButton, mListColors, 3);
 
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index 52bf98aa7..872d34a28 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -708,7 +708,7 @@ public class PanelController implements OnClickListener {
                 break;
             }
             case R.id.redEyeButton: {
-                mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
+                mCurrentImage = showImageView(R.id.imageRedEyes).setShowControls(true);
                 String ename = mCurrentImage.getContext().getString(R.string.redeye);
                 mUtilityPanel.setEffectName(ename);
                 ensureFilter(ename);
diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index af21fda05..a80c73b1a 100644
--- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
@@ -508,4 +508,9 @@ public class ImageLoader {
         }
     }
 
+    public void addCacheListener(ImageShow imageShow) {
+        mHiresCache.addObserver(imageShow);
+        mCache.addObserver(imageShow);
+    }
+
 }
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
index c77de330f..ff7027cf9 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
@@ -17,40 +17,151 @@
 package com.android.gallery3d.filtershow.filters;
 
 import android.graphics.Bitmap;
+import android.graphics.Matrix;
+import android.graphics.RectF;
 
-public class ImageFilterRedEye extends ImageFilter {
-    private static final String TAG = "ImageFilterRedEye";
+import com.android.gallery3d.filtershow.imageshow.GeometryMetadata;
 
+import java.util.Vector;
 
-    public ImageFilterRedEye() {
-        mName = "Redeye";
+public class ImageFilterRedEye extends ImageFilter {
+    private static final String LOGTAG = "ImageFilterRedEye";
+    private Vector<RedEyeCandidate> mCandidates = null;
 
+    public ImageFilterRedEye() {
+        mName = "Red Eye";
     }
 
     @Override
     public ImageFilter clone() throws CloneNotSupportedException {
         ImageFilterRedEye filter = (ImageFilterRedEye) super.clone();
-
+        if (mCandidates != null) {
+            int size = mCandidates.size();
+            filter.mCandidates = new Vector<RedEyeCandidate>();
+            for (int i = 0; i < size; i++) {
+                filter.mCandidates.add(new RedEyeCandidate(mCandidates.elementAt(i)));
+            }
+        }
         return filter;
     }
 
-    native protected void nativeApplyFilter(Bitmap bitmap, int w, int h, short []matrix);
+    @Override
+    public boolean isNil() {
+        if (mCandidates != null && mCandidates.size() > 0) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean same(ImageFilter filter) {
+        boolean isRedEyeFilter = super.same(filter);
+        if (!isRedEyeFilter) {
+            return false;
+        }
+        ImageFilterRedEye redEyeFilter = (ImageFilterRedEye) filter;
+        if (redEyeFilter.mCandidates == null && mCandidates == null) {
+            return true;
+        }
+        if (redEyeFilter.mCandidates == null || mCandidates == null) {
+            return false;
+        }
+        if (redEyeFilter.mCandidates.size() != mCandidates.size()) {
+            return false;
+        }
+        int size = mCandidates.size();
+        for (int i = 0; i < size; i++) {
+            RedEyeCandidate c1 = mCandidates.elementAt(i);
+            RedEyeCandidate c2 = redEyeFilter.mCandidates.elementAt(i);
+            if (!c1.equals(c2)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public Vector<RedEyeCandidate> getCandidates() {
+        if (mCandidates == null) {
+            mCandidates = new Vector<RedEyeCandidate>();
+        }
+        return mCandidates;
+    }
+
+    public void addRect(RectF rect, RectF bounds) {
+        if (mCandidates == null) {
+            mCandidates = new Vector<RedEyeCandidate>();
+        }
+        Vector<RedEyeCandidate> intersects = new Vector<RedEyeCandidate>();
+        for (int i = 0; i < mCandidates.size(); i++) {
+            RedEyeCandidate r = mCandidates.elementAt(i);
+            if (r.intersect(rect)) {
+                intersects.add(r);
+            }
+        }
+        for (int i = 0; i < intersects.size(); i++) {
+            RedEyeCandidate r = intersects.elementAt(i);
+            rect.union(r.mRect);
+            bounds.union(r.mBounds);
+            mCandidates.remove(r);
+        }
+        mCandidates.add(new RedEyeCandidate(rect, bounds));
+    }
+
+    public void clear() {
+        if (mCandidates == null) {
+            mCandidates = new Vector<RedEyeCandidate>();
+        }
+        mCandidates.clear();
+    }
+
+    native protected void nativeApplyFilter(Bitmap bitmap, int w, int h, short[] matrix);
 
     @Override
     public Bitmap apply(Bitmap bitmap, float scaleFactor, boolean highQuality) {
         int w = bitmap.getWidth();
         int h = bitmap.getHeight();
-        float p = mParameter;
-        float value = p;
-        int box = Math.min(w, h);
-        int sizex = Math.min((int)((p+100)*box/400),w/2);
-        int sizey = Math.min((int)((p+100)*box/800),h/2);
-
-        short [] rect = new short[]{
-                (short) (w/2-sizex),(short) (w/2-sizey),
-                (short) (2*sizex),(short) (2*sizey)};
+        short[] rect = new short[4];
 
-        nativeApplyFilter(bitmap, w, h, rect);
+        if (mCandidates != null && mCandidates.size() > 0) {
+            for (int i = 0; i < mCandidates.size(); i++) {
+                RectF r = new RectF(mCandidates.elementAt(i).mRect);
+                GeometryMetadata geo = getImagePreset().mGeoData;
+                Matrix originalToScreen = geo.getOriginalToScreen(true,
+                        getImagePreset().getImageLoader().getOriginalBounds().width(),
+                        getImagePreset().getImageLoader().getOriginalBounds().height(),
+                        w, h);
+                originalToScreen.mapRect(r);
+                if (r.left < 0) {
+                    r.left = 0;
+                }
+                if (r.left > w) {
+                    r.left = w;
+                }
+                if (r.top < 0) {
+                    r.top = 0;
+                }
+                if (r.top > h) {
+                    r.top = h;
+                }
+                if (r.right < 0) {
+                    r.right = 0;
+                }
+                if (r.right > w) {
+                    r.right = w;
+                }
+                if (r.bottom < 0) {
+                    r.bottom = 0;
+                }
+                if (r.bottom > h) {
+                    r.bottom = h;
+                }
+                rect[0] = (short) r.left;
+                rect[1] = (short) r.top;
+                rect[2] = (short) r.width();
+                rect[3] = (short) r.height();
+                nativeApplyFilter(bitmap, w, h, rect);
+            }
+        }
         return bitmap;
     }
 }
diff --git a/src/com/android/gallery3d/filtershow/filters/RedEyeCandidate.java b/src/com/android/gallery3d/filtershow/filters/RedEyeCandidate.java
new file mode 100644
index 000000000..58d3afa3b
--- /dev/null
+++ b/src/com/android/gallery3d/filtershow/filters/RedEyeCandidate.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gallery3d.filtershow.filters;
+
+import android.graphics.RectF;
+
+public class RedEyeCandidate {
+    RectF mRect = new RectF();
+    RectF mBounds = new RectF();
+
+    public RedEyeCandidate(RedEyeCandidate candidate) {
+        mRect.set(candidate.mRect);
+        mBounds.set(candidate.mBounds);
+    }
+
+    public RedEyeCandidate(RectF rect, RectF bounds) {
+        mRect.set(rect);
+        mBounds.set(bounds);
+    }
+
+    public boolean equals(RedEyeCandidate candidate) {
+        if (candidate.mRect.equals(mRect)
+                && candidate.mBounds.equals(mBounds)) {
+            return true;
+        }
+        return false;
+    }
+
+    public boolean intersect(RectF rect) {
+        return mRect.intersect(rect);
+    }
+
+    public RectF getRect() {
+        return mRect;
+    }
+}
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageRedEyes.java b/src/com/android/gallery3d/filtershow/imageshow/ImageRedEyes.java
new file mode 100644
index 000000000..5119dff3c
--- /dev/null
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageRedEyes.java
@@ -0,0 +1,148 @@
+
+package com.android.gallery3d.filtershow.imageshow;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Paint.Style;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+import com.android.gallery3d.filtershow.filters.ImageFilterRedEye;
+import com.android.gallery3d.filtershow.filters.RedEyeCandidate;
+
+public class ImageRedEyes extends ImageSlave {
+
+    private static final String LOGTAG = "ImageRedEyes";
+    private RectF mCurrentRect = null;
+    private static float mTouchPadding = 80;
+
+    public static void setTouchPadding(float padding) {
+        mTouchPadding = padding;
+    }
+
+    public ImageRedEyes(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ImageRedEyes(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void resetParameter() {
+        ImageFilterRedEye filter = (ImageFilterRedEye) getCurrentFilter();
+        if (filter != null) {
+            filter.clear();
+        }
+        mCurrentRect = null;
+        invalidate();
+    }
+
+    @Override
+    public void updateImage() {
+        super.updateImage();
+        invalidate();
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        super.onTouchEvent(event);
+        float ex = event.getX();
+        float ey = event.getY();
+
+        ImageFilterRedEye filter = (ImageFilterRedEye) getCurrentFilter();
+
+        // let's transform (ex, ey) to displayed image coordinates
+        if (event.getAction() == MotionEvent.ACTION_DOWN) {
+            mCurrentRect = new RectF();
+            mCurrentRect.left = ex - mTouchPadding;
+            mCurrentRect.top = ey - mTouchPadding;
+        }
+        if (event.getAction() == MotionEvent.ACTION_MOVE) {
+            mCurrentRect.right = ex + mTouchPadding;
+            mCurrentRect.bottom = ey + mTouchPadding;
+        }
+        if (event.getAction() == MotionEvent.ACTION_UP) {
+            if (mCurrentRect != null) {
+                // transform to original coordinates
+                GeometryMetadata geo = getImagePreset().mGeoData;
+                Matrix originalToScreen = geo.getOriginalToScreen(true,
+                        mImageLoader.getOriginalBounds().width(),
+                        mImageLoader.getOriginalBounds().height(),
+                        getWidth(), getHeight());
+                Matrix originalNoRotateToScreen = geo.getOriginalToScreen(false,
+                        mImageLoader.getOriginalBounds().width(),
+                        mImageLoader.getOriginalBounds().height(),
+                        getWidth(), getHeight());
+
+                Matrix invert = new Matrix();
+                originalToScreen.invert(invert);
+                RectF r = new RectF(mCurrentRect);
+                invert.mapRect(r);
+                RectF r2 = new RectF(mCurrentRect);
+                invert.reset();
+                originalNoRotateToScreen.invert(invert);
+                invert.mapRect(r2);
+                filter.addRect(r, r2);
+                this.resetImageCaches(this);
+            }
+            mCurrentRect = null;
+        }
+        invalidate();
+        return true;
+    }
+
+    @Override
+    public void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        Paint paint = new Paint();
+        paint.setStyle(Style.STROKE);
+        paint.setColor(Color.RED);
+        paint.setStrokeWidth(2);
+        if (mCurrentRect != null) {
+            paint.setColor(Color.RED);
+            RectF drawRect = new RectF(mCurrentRect);
+            canvas.drawRect(drawRect, paint);
+        }
+
+        GeometryMetadata geo = getImagePreset().mGeoData;
+        Matrix originalToScreen = geo.getOriginalToScreen(false,
+                mImageLoader.getOriginalBounds().width(),
+                mImageLoader.getOriginalBounds().height(), getWidth(), getHeight());
+        Matrix originalRotateToScreen = geo.getOriginalToScreen(true,
+                mImageLoader.getOriginalBounds().width(),
+                mImageLoader.getOriginalBounds().height(), getWidth(), getHeight());
+
+        ImageFilterRedEye filter = (ImageFilterRedEye) getCurrentFilter();
+        for (RedEyeCandidate candidate : filter.getCandidates()) {
+            RectF rect = candidate.getRect();
+            RectF drawRect = new RectF();
+            originalToScreen.mapRect(drawRect, rect);
+            RectF fullRect = new RectF();
+            originalRotateToScreen.mapRect(fullRect, rect);
+            paint.setColor(Color.BLUE);
+            canvas.drawRect(fullRect, paint);
+            canvas.drawLine(fullRect.centerX(), fullRect.top,
+                    fullRect.centerX(), fullRect.bottom, paint);
+            canvas.drawLine(fullRect.left, fullRect.centerY(),
+                    fullRect.right, fullRect.centerY(), paint);
+            paint.setColor(Color.GREEN);
+            float dw = drawRect.width();
+            float dh = drawRect.height();
+            float dx = fullRect.centerX() - dw/2;
+            float dy = fullRect.centerY() - dh/2;
+            drawRect.set(dx, dy, dx + dw, dy + dh);
+            canvas.drawRect(drawRect, paint);
+            canvas.drawLine(drawRect.centerX(), drawRect.top,
+                    drawRect.centerX(), drawRect.bottom, paint);
+            canvas.drawLine(drawRect.left, drawRect.centerY(),
+                    drawRect.right, drawRect.centerY(), paint);
+            canvas.drawCircle(drawRect.centerX(), drawRect.centerY(),
+                    mTouchPadding, paint);
+        }
+    }
+}
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
index 358d5b795..fb4a41494 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -83,7 +83,7 @@ public class ImageShow extends View implements OnGestureListener,
     private HistoryAdapter mHistoryAdapter = null;
     private ImageStateAdapter mImageStateAdapter = null;
 
-    private Rect mImageBounds = new Rect();
+    protected Rect mImageBounds = new Rect();
 
     private boolean mTouchShowOriginal = false;
     private long mTouchShowOriginalDate = 0;
@@ -646,13 +646,13 @@ public class ImageShow extends View implements OnGestureListener,
     }
 
     public void updateImage() {
+        invalidate();
         if (!updateGeometryFlags()) {
             return;
         }
         Bitmap bitmap = mImageLoader.getOriginalBitmapLarge();
         if (bitmap != null) {
             imageSizeChanged(bitmap);
-            invalidate();
         }
     }