Use no-op BlurAlgorithm impl by default, get rid of Support RenderScr…

…ipt dependency
rgocal · Apr 3, 2017 · ff98500 · ff98500
1 parent 0228a33
commit ff98500
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 24 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -11,8 +11,6 @@ android {
  buildToolsVersion "25.0.2"
 
  defaultConfig {
- renderscriptTargetApi 25
- renderscriptSupportModeEnabled true
  minSdkVersion 14
  targetSdkVersion 25
  versionCode 15
@@ -32,8 +30,8 @@ configurations {
 
 dependencies {
  compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support:support-annotations:25.1.0'
- javadocDeps 'com.android.support:support-annotations:25.1.0'
+ compile 'com.android.support:support-annotations:25.2.0'
+ javadocDeps 'com.android.support:support-annotations:25.2.0'
 }
 
 apply plugin: 'maven'

diff --git a/library/src/main/java/eightbitlab/com/blurview/BlockingBlurController.java b/library/src/main/java/eightbitlab/com/blurview/BlockingBlurController.java
@@ -81,7 +81,7 @@ public void run() {
  BlockingBlurController(@NonNull View blurView, @NonNull ViewGroup rootView) {
  this.rootView = rootView;
  this.blurView = blurView;
- this.blurAlgorithm = new RenderScriptBlur(blurView.getContext(), true);
+ this.blurAlgorithm = new NoOpBlurAlgorithm();
 
  int measuredWidth = blurView.getMeasuredWidth();
  int measuredHeight = blurView.getMeasuredHeight();

diff --git a/library/src/main/java/eightbitlab/com/blurview/NoOpBlurAlgorithm.java b/library/src/main/java/eightbitlab/com/blurview/NoOpBlurAlgorithm.java
@@ -0,0 +1,26 @@
+package eightbitlab.com.blurview;
+
+import android.graphics.Bitmap;
+import android.support.annotation.NonNull;
+
+class NoOpBlurAlgorithm implements BlurAlgorithm {
+ @Override
+ public Bitmap blur(Bitmap bitmap, float blurRadius) {
+ return bitmap;
+ }
+
+ @Override
+ public void destroy() {
+ }
+
+ @Override
+ public boolean canModifyBitmap() {
+ return true;
+ }
+
+ @NonNull
+ @Override
+ public Bitmap.Config getSupportedBitmapConfig() {
+ return Bitmap.Config.ARGB_8888;
+ }
+}
diff --git a/library/src/main/java/eightbitlab/com/blurview/RenderScriptBlur.java b/library/src/main/java/eightbitlab/com/blurview/RenderScriptBlur.java
@@ -2,27 +2,31 @@
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.os.Build;
+import android.renderscript.Allocation;
+import android.renderscript.Element;
+import android.renderscript.RenderScript;
+import android.renderscript.ScriptIntrinsicBlur;
 import android.support.annotation.NonNull;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.Element;
-import android.support.v8.renderscript.RenderScript;
-import android.support.v8.renderscript.ScriptIntrinsicBlur;
+import android.support.annotation.RequiresApi;
 
 /**
- * Blur using RenderScript, processed on GPU. Currently the fastest blur algorithm.
+ * Blur using RenderScript, processed on GPU.
+ * Requires API 17+
  */
 public final class RenderScriptBlur implements BlurAlgorithm {
  private final RenderScript renderScript;
  private final ScriptIntrinsicBlur blurScript;
  private Allocation outAllocation;
 
- private final boolean canModifyBitmap;
-
  private int lastBitmapWidth = -1;
  private int lastBitmapHeight = -1;
 
- public RenderScriptBlur(Context context, boolean canModifyBitmap) {
- this.canModifyBitmap = canModifyBitmap;
+ /**
+ * @param context Context to create the {@link RenderScript}
+ */
+ @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
+ public RenderScriptBlur(Context context) {
  renderScript = RenderScript.create(context);
  blurScript = ScriptIntrinsicBlur.create(renderScript, Element.U8_4(renderScript));
  }
@@ -36,17 +40,11 @@ private boolean canReuseAllocation(Bitmap bitmap) {
  * @param blurRadius blur radius (1..25)
  * @return blurred bitmap
  */
+ @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
  @Override
  public final Bitmap blur(Bitmap bitmap, float blurRadius) {
  //Allocation will use the same backing array of pixels as bitmap if created with USAGE_SHARED flag
  Allocation inAllocation = Allocation.createFromBitmap(renderScript, bitmap);
- Bitmap outputBitmap;
-
- if (canModifyBitmap) {
- outputBitmap = bitmap;
- } else {
- outputBitmap = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), bitmap.getConfig());
- }
 
  if (!canReuseAllocation(bitmap)) {
  if (outAllocation != null) {
@@ -61,10 +59,10 @@ public final Bitmap blur(Bitmap bitmap, float blurRadius) {
  blurScript.setInput(inAllocation);
  //do not use inAllocation in forEach. it will cause visual artifacts on blurred Bitmap
  blurScript.forEach(outAllocation);
- outAllocation.copyTo(outputBitmap);
+ outAllocation.copyTo(bitmap);
 
  inAllocation.destroy();
- return outputBitmap;
+ return bitmap;
  }
 
  @Override
@@ -78,7 +76,7 @@ public final void destroy() {
 
  @Override
  public boolean canModifyBitmap() {
- return canModifyBitmap;
+ return true;
  }
 
  @NonNull