filters/fx.c \
filters/wbalance.c \
filters/redeye.c \
+ filters/bwfilter.c \
filters/tinyplanet.cc
LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
--- /dev/null
+/*
+ * 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);
+}
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) {
// 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);
}
-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;
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);
}
android:src="@drawable/filtershow_button_colors_contrast"
android:text="@string/saturation" />
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/bwfilterButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_colors_contrast"
+ android:text="@string/bwfilter" />
+
</LinearLayout>
</HorizontalScrollView>
</FrameLayout>
<string name="vibrance">Vibrance</string>
<!-- Label for the saturation filter button [CHAR LIMIT=15] -->
<string name="saturation">Saturation</string>
+ <!-- Label for the BW filter button [CHAR LIMIT=15] -->
+ <string name="bwfilter">BW Filter</string>
<!-- Label for the White Balance filter button [CHAR LIMIT=15] -->
<string name="wbalance">Autocolor</string>
<!-- Label for the Hue filter button [CHAR LIMIT=15] -->
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;
R.id.vibranceButton,
R.id.contrastButton,
R.id.saturationButton,
+ R.id.bwfilterButton,
R.id.wbalanceButton,
R.id.hueButton,
R.id.exposureButton,
new ImageFilterVibrance(),
new ImageFilterContrast(),
new ImageFilterSaturated(),
+ new ImageFilterBwFilter(),
new ImageFilterWBalance(),
new ImageFilterHue(),
new ImageFilterExposure(),
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;
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);
}
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);
--- /dev/null
+/*
+ * 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;
+ }
+}
}
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) {
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;
}
}
OSDN Git Service
