diff options
| -rw-r--r-- | Android.mk | 9 | ||||
| -rw-r--r-- | proguard.flags | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java | 8 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java | 6 |
4 files changed, 14 insertions, 11 deletions
diff --git a/Android.mk b/Android.mk index 8b131834b..7789619f3 100644 --- a/Android.mk +++ b/Android.mk @@ -8,6 +8,11 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit LOCAL_STATIC_JAVA_LIBRARIES += mp4parser +LOCAL_STATIC_JAVA_LIBRARIES += android.support.v8.renderscript + +LOCAL_RENDERSCRIPT_TARGET_API := 18 +LOCAL_RENDERSCRIPT_COMPATIBILITY := 18 +LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) LOCAL_SRC_FILES += $(call all-java-files-under, src_pd) @@ -27,9 +32,9 @@ LOCAL_SDK_VERSION := current # the libraries in the APK, otherwise just put them in /system/lib and # leave them out of the APK ifneq (,$(TARGET_BUILD_APPS)) - LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters + LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni else - LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters + LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni endif LOCAL_PROGUARD_FLAG_FILES := proguard.flags diff --git a/proguard.flags b/proguard.flags index b54b0c791..dce9d077d 100644 --- a/proguard.flags +++ b/proguard.flags @@ -45,6 +45,8 @@ # Disable the warnings of using dynamic method calls in EffectsRecorder -dontnote com.android.camera.EffectsRecorder +-keep class android.support.v8.renderscript.** { *; } + # Required for ActionBarSherlock -keep class android.support.v4.app.** { *; } -keep interface android.support.v4.app.** { *; } diff --git a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java index 2dbd1f374..d415250a4 100644 --- a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java +++ b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java @@ -19,9 +19,7 @@ package com.android.gallery3d.filtershow.cache; import android.graphics.Bitmap; import android.os.*; import android.os.Process; -import android.renderscript.Allocation; -import android.renderscript.Allocation.MipmapControl; -import android.renderscript.RenderScript; +import android.support.v8.renderscript.*; import android.util.Log; import com.android.gallery3d.filtershow.filters.ImageFilterRS; @@ -164,13 +162,13 @@ public class FilteringPipeline implements Handler.Callback { mFiltersOnlyOriginalAllocation.destroy(); } mFiltersOnlyOriginalAllocation = Allocation.createFromBitmap(RS, mOriginalBitmap, - MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); + Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); if (mOriginalAllocation != null) { mOriginalAllocation.destroy(); } mResizedOriginalBitmap = preset.applyGeometry(mOriginalBitmap); mOriginalAllocation = Allocation.createFromBitmap(RS, mResizedOriginalBitmap, - MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); + Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); mPreviousGeometry = new GeometryMetadata(geometry); return true; } diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java index 63dc82c34..368e29a78 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java @@ -18,9 +18,7 @@ package com.android.gallery3d.filtershow.filters; import android.app.Activity; import android.graphics.Bitmap; -import android.renderscript.Allocation; -import android.renderscript.Allocation.MipmapControl; -import android.renderscript.RenderScript; +import android.support.v8.renderscript.*; import android.util.Log; public class ImageFilterRS extends ImageFilter { @@ -48,7 +46,7 @@ public class ImageFilterRS extends ImageFilter { } Bitmap bitmapBuffer = bitmap.copy(mBitmapConfig, true); mOutPixelsAllocation = Allocation.createFromBitmap(mRS, bitmapBuffer, - MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); + Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); mInPixelsAllocation = Allocation.createTyped(mRS, mOutPixelsAllocation.getType()); sOldBitmap = bitmap; |