summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-04-12 17:47:14 -0700
committernicolasroard <nicolasroard@google.com>2013-04-12 18:07:11 -0700
commitd02932454e58d6858ec80d64932247f73dd0b19b (patch)
tree62e056f7bddf88594146908fbae2017bdb8c54f4
parenta3211b06f224ea79db8dac02b5ed19ccdb9f9094 (diff)
downloadandroid_packages_apps_Snap-d02932454e58d6858ec80d64932247f73dd0b19b.zip
android_packages_apps_Snap-d02932454e58d6858ec80d64932247f73dd0b19b.tar.gz
android_packages_apps_Snap-d02932454e58d6858ec80d64932247f73dd0b19b.tar.bz2
Add direct rendering for border
bug:8603245 Change-Id: Ibc1bde9adb19f930b474e4076a0c2720fbe0bc8d
-rw-r--r--src/com/android/gallery3d/filtershow/cache/CachingPipeline.java2
-rw-r--r--src/com/android/gallery3d/filtershow/presets/ImagePreset.java15
2 files changed, 17 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java b/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
index b8dc466..8cb8f8f 100644
--- a/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
+++ b/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
@@ -308,6 +308,8 @@ public class CachingPipeline {
setupEnvironment(preset, false);
mFiltersManager.freeFilterResources(preset);
preset.applyFilters(-1, -1, in, out, mEnvironment);
+ // TODO: we should render the border onto a different bitmap instead
+ preset.applyBorder(in, out, mEnvironment);
}
}
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 791164f..00f5977 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -22,6 +22,7 @@ import android.support.v8.renderscript.Allocation;
import android.util.Log;
import com.android.gallery3d.filtershow.ImageStateAdapter;
+import com.android.gallery3d.filtershow.cache.CachingPipeline;
import com.android.gallery3d.filtershow.cache.ImageLoader;
import com.android.gallery3d.filtershow.filters.BaseFiltersManager;
import com.android.gallery3d.filtershow.filters.FilterRepresentation;
@@ -228,6 +229,10 @@ public class ImagePreset {
mBorder = filter;
}
+ public void resetBorder() {
+ mBorder = null;
+ }
+
public boolean isFx() {
return mIsFxPreset;
}
@@ -474,6 +479,16 @@ public class ImagePreset {
return bitmap;
}
+ public void applyBorder(Allocation in, Allocation out, FilterEnvironment environment) {
+ if (mBorder != null && mDoApplyGeometry) {
+ mBorder.synchronizeRepresentation();
+ // TODO: should keep the bitmap around
+ Allocation bitmapIn = Allocation.createTyped(CachingPipeline.getRenderScriptContext(), in.getType());
+ bitmapIn.copyFrom(out);
+ environment.applyRepresentation(mBorder, bitmapIn, out);
+ }
+ }
+
public void applyFilters(int from, int to, Allocation in, Allocation out, FilterEnvironment environment) {
if (mDoApplyFilters) {
if (from < 0) {