From 67fefdb9b77644c955e1c0c5b1fcd51e2374f212 Mon Sep 17 00:00:00 2001 From: John Hoford 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 ++-- res/layout/filtershow_activity.xml | 6 +++ res/values/filtershow_strings.xml | 2 + .../gallery3d/filtershow/FilterShowActivity.java | 3 ++ .../gallery3d/filtershow/PanelController.java | 12 +++++ .../filtershow/filters/ImageFilterBwFilter.java | 53 +++++++++++++++++++++ .../filtershow/filters/ImageFilterTinyPlanet.java | 5 +- 9 files changed, 140 insertions(+), 6 deletions(-) create mode 100644 jni/filters/bwfilter.c create mode 100644 src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java 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 +#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); } diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index 6cebb3698..f6900b3c2 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -358,6 +358,12 @@ android:src="@drawable/filtershow_button_colors_contrast" android:text="@string/saturation" /> + + diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index 3862865ef..852ef7474 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -103,6 +103,8 @@ Vibrance Saturation + + BW Filter Autocolor diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 8bae88cad..9db4d733b 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -55,6 +55,7 @@ import com.android.gallery3d.data.LocalAlbum; import com.android.gallery3d.filtershow.cache.ImageLoader; import com.android.gallery3d.filtershow.filters.ImageFilter; import com.android.gallery3d.filtershow.filters.ImageFilterBorder; +import com.android.gallery3d.filtershow.filters.ImageFilterBwFilter; import com.android.gallery3d.filtershow.filters.ImageFilterContrast; import com.android.gallery3d.filtershow.filters.ImageFilterExposure; import com.android.gallery3d.filtershow.filters.ImageFilterFx; @@ -255,6 +256,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, R.id.vibranceButton, R.id.contrastButton, R.id.saturationButton, + R.id.bwfilterButton, R.id.wbalanceButton, R.id.hueButton, R.id.exposureButton, @@ -266,6 +268,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, new ImageFilterVibrance(), new ImageFilterContrast(), new ImageFilterSaturated(), + new ImageFilterBwFilter(), new ImageFilterWBalance(), new ImageFilterHue(), new ImageFilterExposure(), diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index 9fc1109cb..2bf95e759 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -27,6 +27,7 @@ import android.widget.TextView; import com.android.gallery3d.R; import com.android.gallery3d.filtershow.filters.ImageFilter; +import com.android.gallery3d.filtershow.filters.ImageFilterBwFilter; import com.android.gallery3d.filtershow.filters.ImageFilterContrast; import com.android.gallery3d.filtershow.filters.ImageFilterCurves; import com.android.gallery3d.filtershow.filters.ImageFilterExposure; @@ -547,6 +548,10 @@ public class PanelController implements OnClickListener { && name.equalsIgnoreCase(mCurrentImage.getContext().getString(R.string.saturation))) { filter = setImagePreset(new ImageFilterSaturated(), name); } + if (filter == null + && name.equalsIgnoreCase(mCurrentImage.getContext().getString(R.string.bwfilter))) { + filter = setImagePreset(new ImageFilterBwFilter(), name); + } if (filter == null && name.equalsIgnoreCase(mCurrentImage.getContext().getString(R.string.hue))) { filter = setImagePreset(new ImageFilterHue(), name); @@ -704,6 +709,13 @@ public class PanelController implements OnClickListener { ensureFilter(ename); break; } + case R.id.bwfilterButton: { + mCurrentImage = showImageView(R.id.imageShow).setShowControls(true); + String ename = mCurrentImage.getContext().getString(R.string.bwfilter); + mUtilityPanel.setEffectName(ename); + ensureFilter(ename); + break; + } case R.id.wbalanceButton: { mCurrentImage = showImageView(R.id.imageShow).setShowControls(false); String ename = mCurrentImage.getContext().getString(R.string.wbalance); diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java new file mode 100644 index 000000000..558abe3c3 --- /dev/null +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java @@ -0,0 +1,53 @@ +/* + * 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.Bitmap; +import android.graphics.Color; + + +public class ImageFilterBwFilter extends ImageFilter { + + public ImageFilterBwFilter() { + mName = "BW Filter"; + mMaxParameter = 180; + mMinParameter = -180; + } + + @Override + public ImageFilter clone() throws CloneNotSupportedException { + ImageFilterBwFilter filter = (ImageFilterBwFilter) super.clone(); + return filter; + } + + native protected void nativeApplyFilter(Bitmap bitmap, int w, int h, int r, int g, int b); + + @Override + public Bitmap apply(Bitmap bitmap, float scaleFactor, boolean highQuality) { + int w = bitmap.getWidth(); + int h = bitmap.getHeight(); + float[] hsv = new float[] { + 180 + mParameter, 1, 1 + }; + int rgb = Color.HSVToColor(hsv); + int r = 0xFF & (rgb >> 16); + int g = 0xFF & (rgb >> 8); + int b = 0xFF & (rgb >> 0); + nativeApplyFilter(bitmap, w, h, r, g, b); + return bitmap; + } +} diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java index ccf0dc951..1dc173123 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java @@ -38,7 +38,8 @@ public class ImageFilterTinyPlanet extends ImageFilter { } native protected void nativeApplyFilter( - Bitmap bitmapIn, int width, int height, Bitmap bitmapOut, int outSize, float scale); + Bitmap bitmapIn, int width, int height, Bitmap bitmapOut, int outSize, float scale, + float angle); @Override public Bitmap apply(Bitmap bitmapIn, float scaleFactor, boolean highQuality) { @@ -61,7 +62,7 @@ public class ImageFilterTinyPlanet extends ImageFilter { outputSize, outputSize, Bitmap.Config.ARGB_8888); // TODO(haeberling): Add the padding back in based on the meta-data. - nativeApplyFilter(bitmapIn, w, h, mBitmapOut, outputSize, mParameter / 100f); + nativeApplyFilter(bitmapIn, w, h, mBitmapOut, outputSize, mParameter / 100f, 0f); return mBitmapOut; } } -- cgit v1.2.3