Creepso/NuvioStreaming
1
0
Fork 0
mirror of https://github.com/tapframe/NuvioStreaming.git synced 2026-08-03 18:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: recycled bitmap crash in Now Playing metadata

Browse source
This commit is contained in:
KhooLy 2026-07-19 23:38:13 +03:00
parent 94b8848378
commit 70bdafab48
1 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerNowPlayingController.android.kt
View file

@ -90,7 +90,10 @@ internal class AndroidPlayerNowPlayingController(
private var metadata: AndroidNowPlayingMetadata? = null
private var snapshot = PlayerPlaybackSnapshot()
private var artworkBitmap: Bitmap? = null
private var artworkArt: Bitmap? = null
private var artworkAlbumArt: Bitmap? = null
private var artworkDisplayIcon: Bitmap? = null
private var artworkNotificationIcon: Bitmap? = null
private var released = false
private var lastPublishedPositionMs = Long.MIN_VALUE
private var lastPublishedDurationMs = Long.MIN_VALUE
@ -126,7 +129,10 @@ internal class AndroidPlayerNowPlayingController(
mediaSession.isActive = true
if (artworkChanged) {
artworkBitmap = null
artworkArt = null
artworkAlbumArt = null
artworkDisplayIcon = null
artworkNotificationIcon = null
loadArtwork(normalized.artworkUrl)
}
@ -184,7 +190,10 @@ internal class AndroidPlayerNowPlayingController(
artworkGeneration.incrementAndGet()
metadata = null
snapshot = PlayerPlaybackSnapshot()
artworkBitmap = null
artworkArt = null
artworkAlbumArt = null
artworkDisplayIcon = null
artworkNotificationIcon = null
resetPublishedPlaybackState()
mediaSession.setMetadata(null)
mediaSession.setPlaybackState(
@ -209,13 +218,23 @@ internal class AndroidPlayerNowPlayingController(
snapshot.durationMs.takeIf { it > 0L }?.let { durationMs ->
builder.putLong(MediaMetadata.METADATA_KEY_DURATION, durationMs)
}
artworkBitmap?.let { artwork ->
builder.putBitmap(MediaMetadata.METADATA_KEY_ART, artwork)
builder.putBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART, artwork)
builder.putBitmap(MediaMetadata.METADATA_KEY_DISPLAY_ICON, artwork)
val base = builder.build()
val withArtwork = artworkArt?.takeIf { !it.isRecycled }?.let { art ->
MediaMetadata.Builder(base)
.putBitmap(MediaMetadata.METADATA_KEY_ART, art)
.apply {
artworkAlbumArt?.takeIf { !it.isRecycled }
?.let { putBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART, it) }
artworkDisplayIcon?.takeIf { !it.isRecycled }
?.let { putBitmap(MediaMetadata.METADATA_KEY_DISPLAY_ICON, it) }
}
.build()
}
mediaSession.setMetadata(builder.build())
if (withArtwork == null || runCatching { mediaSession.setMetadata(withArtwork) }.isFailure) {
runCatching { mediaSession.setMetadata(base) }
}
}
private fun publishPlaybackState(force: Boolean) {
@ -275,7 +294,7 @@ internal class AndroidPlayerNowPlayingController(
sessionToken = mediaSession.sessionToken,
metadata = currentMetadata,
snapshot = snapshot,
artwork = artworkBitmap,
artwork = artworkNotificationIcon?.takeIf { !it.isRecycled },
)
PlayerNowPlayingService.publish(appContext, notification)
}
@ -291,10 +310,12 @@ internal class AndroidPlayerNowPlayingController(
mainHandler.post {
if (released || generation != artworkGeneration.get() || metadata?.artworkUrl != urlString) {
bitmap?.recycle()
return@post
}
artworkBitmap = bitmap
artworkArt = bitmap
artworkAlbumArt = bitmap?.let(::copyArtwork)
artworkDisplayIcon = bitmap?.let(::copyArtwork)
artworkNotificationIcon = bitmap?.let(::copyArtwork)
publishMetadata()
publishNotification()
}
@ -533,6 +554,9 @@ private fun downloadArtwork(urlString: String): Bitmap? {
}
}
private fun copyArtwork(bitmap: Bitmap): Bitmap? =
if (bitmap.isRecycled) null else runCatching { bitmap.copy(bitmap.config ?: Bitmap.Config.ARGB_8888, false) }.getOrNull()
private fun decodeSampledBitmap(bytes: ByteArray, maxEdgePx: Int): Bitmap? {
val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true }
BitmapFactory.decodeByteArray(bytes, 0, bytes.size, bounds)