From 67fefdb9b77644c955e1c0c5b1fcd51e2374f212 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Tue, 23 Oct 2012 15:17:12 -0700
Subject: add support for black and white filters, add rotation API to tiny
 planet

bug:7386370
bug:7389189
Change-Id: I1720893000c39edf28a356fb7b56634f004ef120
---
 jni/Android.mk            |  1 +
 jni/filters/bwfilter.c    | 55 +++++++++++++++++++++++++++++++++++++++++++++++
 jni/filters/tinyplanet.cc |  9 ++++----
 3 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 jni/filters/bwfilter.c

(limited to 'jni')

diff --git a/jni/Android.mk b/jni/Android.mk
index fb8ba86ec..db31bfdf6 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := filters/bw.c \
                    filters/fx.c \
                    filters/wbalance.c \
                    filters/redeye.c \
+                   filters/bwfilter.c \
                    filters/tinyplanet.cc
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
diff --git a/jni/filters/bwfilter.c b/jni/filters/bwfilter.c
new file mode 100644
index 000000000..f7fb31ad1
--- /dev/null
+++ b/jni/filters/bwfilter.c
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+#include <math.h>
+#include "filters.h"
+
+void JNIFUNCF(ImageFilterBwFilter, nativeApplyFilter, jobject bitmap, jint width, jint height, jint rw, jint gw, jint bw)
+{
+    char* destination = 0;
+    AndroidBitmap_lockPixels(env, bitmap, (void**) &destination);
+    unsigned char * rgb = (unsigned char * )destination;
+    float sr = rw;
+    float sg = gw;
+    float sb = bw;
+
+    float min = MIN(sg,sb);
+    min = MIN(sr,min);
+    float max =  MAX(sg,sb);
+    max = MAX(sr,max);
+    float avg = (min+max)/2;
+    sb /= avg;
+    sg /= avg;
+    sr /= avg;
+    int i;
+    int len = width * height * 4;
+
+    for (i = 0; i < len; i+=4)
+    {
+        float r = sr *rgb[RED];
+        float g = sg *rgb[GREEN];
+        float b = sb *rgb[BLUE];
+        min = MIN(g,b);
+        min = MIN(r,min);
+        max = MAX(g,b);
+        max = MAX(r,max);
+        avg =(min+max)/2;
+        rgb[RED]   = CLAMP(avg);
+        rgb[GREEN] = rgb[RED];
+        rgb[BLUE]  = rgb[RED];
+    }
+    AndroidBitmap_unlockPixels(env, bitmap);
+}
diff --git a/jni/filters/tinyplanet.cc b/jni/filters/tinyplanet.cc
index bc12c32f1..a40470d34 100644
--- a/jni/filters/tinyplanet.cc
+++ b/jni/filters/tinyplanet.cc
@@ -87,7 +87,7 @@ inline float wrap(float value, float dimension) {
   return value - (dimension * floor(value/dimension));
 }
 
-void StereographicProjection(float scale, unsigned char* input_image,
+void StereographicProjection(float scale, float angle, unsigned char* input_image,
                              int input_width, int input_height,
                              unsigned char* output_image, int output_width,
                              int output_height) {
@@ -106,7 +106,8 @@ void StereographicProjection(float scale, unsigned char* input_image,
 
       // Convert to polar
       float r = hypotf(xf, yf);
-      float theta = atan2(yf, xf);
+      float theta = angle+atan2(yf, xf);
+      if (theta>PI_F) theta-=2*PI_F;
 
       // Project onto plane
       float phi = 2 * atan(1 / r);
@@ -127,7 +128,7 @@ void StereographicProjection(float scale, unsigned char* input_image,
 }
 
 
-void JNIFUNCF(ImageFilterTinyPlanet, nativeApplyFilter, jobject bitmap_in, jint width, jint height, jobject bitmap_out, jint output_size, jfloat scale)
+void JNIFUNCF(ImageFilterTinyPlanet, nativeApplyFilter, jobject bitmap_in, jint width, jint height, jobject bitmap_out, jint output_size, jfloat scale,jfloat angle)
 {
     char* source = 0;
     char* destination = 0;
@@ -136,7 +137,7 @@ void JNIFUNCF(ImageFilterTinyPlanet, nativeApplyFilter, jobject bitmap_in, jint
     unsigned char * rgb_in = (unsigned char * )source;
     unsigned char * rgb_out = (unsigned char * )destination;
 
-    StereographicProjection(scale, rgb_in, width, height, rgb_out, output_size, output_size);
+    StereographicProjection(scale,angle, rgb_in, width, height, rgb_out, output_size, output_size);
     AndroidBitmap_unlockPixels(env, bitmap_in);
     AndroidBitmap_unlockPixels(env, bitmap_out);
 }
-- 
cgit v1.2.3