-
Notifications
You must be signed in to change notification settings - Fork 50
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Paywalls: backwards compatible blurring #1327
Merged
NachoSoto
merged 11 commits into
paywalls
from
andy/pwl-247-backwards-compatible-blurring-renderscript
Oct 19, 2023
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
4b22c1f
update the code to use a blur transformation instead of a modifier
aboedo de56b10
update to adapt to different pixel densities
aboedo cb65f39
added blur algorithm
aboedo 1d51f1f
moved to blurring with RenderScript
aboedo f28fce4
re-added averages blur algorithm
aboedo ed4e957
added benchmarking code
aboedo 19ef51e
clean up blurring implementation
aboedo ef31b22
clean up blur benchmark test
aboedo 119c260
Cleaned up code and tests
NachoSoto d5f4c95
Lint
NachoSoto 1ef2a52
PR comments
NachoSoto File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
...ui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/BlurTransformation.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
import android.content.Context | ||
import android.graphics.Bitmap | ||
import android.renderscript.Allocation | ||
import android.renderscript.Element | ||
import android.renderscript.RenderScript | ||
import android.renderscript.ScriptIntrinsicBlur | ||
import coil.size.Size | ||
import coil.transform.Transformation | ||
import kotlin.math.min | ||
|
||
/** | ||
* BlurTransformation class applies a blur on a given Bitmap image. | ||
* The blurring is performed with RenderScript, and should only be used in API level < 31, since newer versions | ||
* of Android have their own native blur implementation. | ||
* | ||
* @property radius - The radius of the square used for blurring. Higher values | ||
* produce a more pronounced blur effect. | ||
*/ | ||
internal class BlurTransformation( | ||
private val context: Context, | ||
private val radius: Float, | ||
) : Transformation { | ||
override val cacheKey: String = "${javaClass.name}-$radius" | ||
|
||
override suspend fun transform( | ||
input: Bitmap, | ||
size: Size, | ||
): Bitmap { | ||
return input.blur(context, radius) | ||
} | ||
} | ||
|
||
// max radius supported by RenderScript | ||
private const val MAX_SUPPORTED_RADIUS = 25f | ||
|
||
internal fun Bitmap.blur(context: Context, radius: Float = MAX_SUPPORTED_RADIUS): Bitmap { | ||
if (radius < 1f) { | ||
return this@blur | ||
} | ||
val updatedRadius = min(radius.toDouble(), MAX_SUPPORTED_RADIUS.toDouble()) | ||
|
||
val rs = RenderScript.create(context) | ||
val input = Allocation.createFromBitmap(rs, this) | ||
val output = Allocation.createTyped(rs, input.type) | ||
val script = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs)) | ||
|
||
script.setRadius(updatedRadius.toFloat()) | ||
script.setInput(input) | ||
script.forEach(output) | ||
|
||
val blurredBitmap = Bitmap.createBitmap(width, height, config) | ||
output.copyTo(blurredBitmap) | ||
|
||
input.destroy() | ||
output.destroy() | ||
script.destroy() | ||
rs.destroy() | ||
|
||
return blurredBitmap | ||
} |
45 changes: 45 additions & 0 deletions
45
...tui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/BlurBenchmarkTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
package com.revenuecat.purchases.ui.revenuecatui.helpers | ||
|
||
import android.content.ContentValues.TAG | ||
import android.content.Context | ||
import android.graphics.Bitmap | ||
import android.graphics.BitmapFactory | ||
import android.util.Log | ||
import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
import androidx.test.platform.app.InstrumentationRegistry | ||
import blur | ||
import kotlinx.coroutines.runBlocking | ||
import org.junit.Ignore | ||
import org.junit.Test | ||
import org.junit.runner.RunWith | ||
|
||
@RunWith(AndroidJUnit4::class) | ||
class BlurBenchmarkTest { | ||
@Ignore("Test is for checking performance only") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I disabled this so we don't run it every time unnecessarily. |
||
@Test | ||
fun `Blur images using native blur`() = runBlocking { | ||
benchmarkBlur("Native Blur") { image, context, radius -> | ||
image.blur(context = context, radius = radius) | ||
} | ||
} | ||
|
||
private suspend fun benchmarkBlur(functionName: String, blurFunction: suspend (Bitmap, Context, Float) -> Unit) { | ||
val context = InstrumentationRegistry.getInstrumentation().targetContext | ||
val image = openImage() | ||
val radius = 25f | ||
val iterations = 100 | ||
val startTime = System.currentTimeMillis() | ||
repeat(iterations) { | ||
blurFunction(image, context, radius) | ||
} | ||
val endTime = System.currentTimeMillis() | ||
val totalTime = endTime - startTime | ||
val averageTime = totalTime / iterations | ||
Log.d(TAG, "$functionName:\nTotal time: $totalTime ms, Average time: $averageTime ms") | ||
} | ||
|
||
private fun openImage(): Bitmap { | ||
val inputStream = javaClass.classLoader!!.getResource("sample_blurring_image.jpeg").openStream() | ||
return BitmapFactory.decodeStream(inputStream) | ||
} | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's interesting that this is a suspend function... I guess in case the transformation takes a long time.