add redeye and improve shadow removal

bug:7234321
Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681

1 files changed, 38 insertions, 20 deletions

diff --git a/jni/filters/shadows.c b/jni/filters/shadows.c
index f812b93f8..38d64c8b5 100644
--- a/jni/filters/shadows.c
+++ b/jni/filters/shadows.c
@@ -17,23 +17,41 @@
 #include <math.h>
 #include "filters.h"
 
- void JNIFUNCF(ImageFilterShadows, nativeApplyFilter, jobject bitmap, jint width, jint height, jshortArray vlut)
- {
-     char* destination = 0;
-     AndroidBitmap_lockPixels(env, bitmap, (void**) &destination);
-     unsigned char * rgb = (unsigned char * )destination;
-     int i;
-     int len = width * height * 4;
-     short* lut = (*env)->GetShortArrayElements(env, vlut,0);
-     unsigned short * hsv = (unsigned short *)malloc(3*sizeof(short));
-     for (i = 0; i < len; i+=4)
-     {
-       rgb2hsv(rgb,i,hsv,0);
-       hsv[0] = lut[hsv[0]];
-       hsv2rgb(hsv,0, rgb,i);
-     }
-
-     (*env)->ReleaseShortArrayElements(env, vlut, lut, 0);
-     free(hsv);
-     AndroidBitmap_unlockPixels(env, bitmap);
- }
+void JNIFUNCF(ImageFilterShadows, nativeApplyFilter, jobject bitmap, jint width, jint height, float scale){
+    double shadowFilterMap[] = {
+            -0.00591,  0.0001,
+             1.16488,  0.01668,
+            -0.18027, -0.06791,
+            -0.12625,  0.09001,
+             0.15065, -0.03897
+    };
+
+    char* destination = 0;
+    AndroidBitmap_lockPixels(env, bitmap, (void**) &destination);
+    unsigned char * rgb = (unsigned char * )destination;
+    int i;
+    double s = (scale>=0)?scale:scale/5;
+    int len = width * height * 4;
+
+    double *poly = (double *) malloc(5*sizeof(double));
+    for (i = 0; i < 5; i++) {
+        poly[i] = fastevalPoly(shadowFilterMap+i*2,2 , s);
+    }
+
+    unsigned short * hsv = (unsigned short *)malloc(3*sizeof(short));
+
+    for (i = 0; i < len; i+=4)
+    {
+        rgb2hsv(rgb,i,hsv,0);
+
+        double v = (fastevalPoly(poly,5,hsv[0]/4080.)*4080);
+        if (v>4080) v = 4080;
+        hsv[0] = (unsigned short) ((v>0)?v:0);
+
+        hsv2rgb(hsv,0, rgb,i);
+    }
+
+    free(poly);
+    free(hsv);
+    AndroidBitmap_unlockPixels(env, bitmap);
+}