Skip to content

fix(image_layers) image layers crash on Android #119

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.

Sign up for GitHub

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

Merged
hm21 merged 5 commits into from
Apr 11, 2026
Merged

fix(image_layers) image layers crash on Android #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9fd0465
attempt to fix image layers crash on Android
ekuleshov Apr 9, 2026
fe2b951
fix(image_layers) attempt to fix image layers crash on Android
ekuleshov Apr 9, 2026
4412fe2
removed redundant size check
ekuleshov Apr 10, 2026
e0bb0f7
recycle intermediate thumbnail bitmaps
ekuleshov Apr 10, 2026
951da58
Merge remote-tracking branch 'origin/android_image_recycle' into andr…
ekuleshov Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions ...d/src/main/kotlin/ch/waio/pro_video_editor/src/features/render/helpers/ApplyImageLayer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import androidx.media3.common.Effect
import androidx.media3.common.util.UnstableApi
import androidx.media3.effect.BitmapOverlay
import androidx.media3.effect.OverlayEffect
import ch.waio.pro_video_editor.src.features.render.utils.getRotatedVideoDimensions
import java.io.File
import java.nio.ByteBuffer
import androidx.core.graphics.scale
import androidx.media3.effect.StaticOverlaySettings
import androidx.media3.effect.TimestampWrapper
import ch.waio.pro_video_editor.src.features.render.models.ImageLayer

/**
* Applies static image overlay on video.
Expand All @@ -38,7 +38,7 @@ import androidx.media3.effect.TimestampWrapper
fun applyImageLayer(
videoEffects: MutableList<Effect>,
inputFile: File,
imageLayers: List<ch.waio.pro_video_editor.src.features.render.models.ImageLayer>,
imageLayers: List<ImageLayer>,
rotationDegrees: Float,
cropWidth: Int?,
cropHeight: Int?,
Expand Down Expand Up @@ -90,7 +90,8 @@ fun applyTimedImageLayers(
// Scale to target size if provided
val sizedBitmap = if (layer.width != null && layer.height != null) {
val scaled = layerBitmap.scale(layer.width.toInt(), layer.height.toInt())
layerBitmap.recycle()
// scale() may return the same object when dimensions already match
if (scaled !== layerBitmap) layerBitmap.recycle()
scaled
} else {
layerBitmap
Expand All @@ -106,13 +107,8 @@ fun applyTimedImageLayers(

if (isStretched) {
// Stretch image to fill the entire video frame
val scaledOverlay = if (sizedBitmap.width != videoWidth || sizedBitmap.height != videoHeight) {
val scaled = sizedBitmap.scale(videoWidth, videoHeight)
sizedBitmap.recycle()
scaled
} else {
sizedBitmap
}
val scaledOverlay = sizedBitmap.scale(videoWidth, videoHeight)
if (scaledOverlay !== sizedBitmap) sizedBitmap.recycle()

val unpremultiplied = unpremultiplyAlpha(scaledOverlay)
if (unpremultiplied !== scaledOverlay) scaledOverlay.recycle()
Expand Down
41 changes: 26 additions & 15 deletions ...oid/src/main/kotlin/ch/waio/pro_video_editor/src/features/thumbnail/ThumbnailGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import kotlinx.coroutines.withContext
import java.io.ByteArrayOutputStream
import java.io.File
import java.util.concurrent.atomic.AtomicInteger
import androidx.core.graphics.scale

/**
* Service for generating video thumbnail images.
Expand Down Expand Up @@ -140,13 +141,18 @@ class ThumbnailGenerator(private val context: Context) {
if (bitmap != null) {
val resized =
resizeBitmapKeepingAspect(bitmap, outputWidth, outputHeight, boxFit)
val bytes = compressBitmap(resized, outputFormat, jpegQuality)
thumbnails[index] = bytes
val duration = System.currentTimeMillis() - startTime
Log.d(
THUMBNAIL_TAG,
"✅ [$index] Generated in $duration ms (${bytes.size} bytes)"
)
try {
val bytes = compressBitmap(resized, outputFormat, jpegQuality)
thumbnails[index] = bytes
val duration = System.currentTimeMillis() - startTime
Log.d(
THUMBNAIL_TAG,
"✅ [$index] Generated in $duration ms (${bytes.size} bytes)"
)
} finally {
if (resized !== bitmap) bitmap.recycle()
resized.recycle()
}
} else {
Log.w(THUMBNAIL_TAG, "[$index] ❌ Null frame at ${timeUs / 1000} ms")
}
Expand Down Expand Up @@ -217,13 +223,18 @@ class ThumbnailGenerator(private val context: Context) {
if (bitmap != null) {
val resized =
resizeBitmapKeepingAspect(bitmap, outputWidth, outputHeight, boxFit)
val bytes = compressBitmap(resized, outputFormat, jpegQuality)
thumbnails[index] = bytes
val duration = System.currentTimeMillis() - startTime
Log.d(
THUMBNAIL_TAG,
"[$index] ✅ ${timeUs / 1000} ms in $duration ms (${bytes.size} bytes)"
)
try {
val bytes = compressBitmap(resized, outputFormat, jpegQuality)
thumbnails[index] = bytes
val duration = System.currentTimeMillis() - startTime
Log.d(
THUMBNAIL_TAG,
"[$index] ✅ ${timeUs / 1000} ms in $duration ms (${bytes.size} bytes)"
)
} finally {
if (resized !== bitmap) bitmap.recycle()
resized.recycle()
}
} else {
Log.w(THUMBNAIL_TAG, "[$index] ❌ Null frame at ${timeUs / 1000} ms")
}
Expand Down Expand Up @@ -328,7 +339,7 @@ class ThumbnailGenerator(private val context: Context) {
val resizedWidth = (originalWidth * scale).toInt()
val resizedHeight = (originalHeight * scale).toInt()

return Bitmap.createScaledBitmap(original, resizedWidth, resizedHeight, true)
return original.scale(resizedWidth, resizedHeight)
}

/**
Expand Down
Loading