Run Bitmap decoding not on main thread (#601)

Co-authored-by: Gaëtan Muller <[email protected]>

Author: StaehliJ

pillarbox-player/src/main/java/ch/srgssr/pillarbox/player/notification/PillarboxMediaDescriptionAdapter.kt

@@ -14,21 +14,23 @@ import androidx.media3.common.Player
 import androidx.media3.ui.PlayerNotificationManager
 import androidx.media3.ui.PlayerNotificationManager.MediaDescriptionAdapter
 import androidx.media3.ui.R
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
 import java.net.URL
 
 /**
  * Pillarbox media description adapter
  *
  * @param pendingIntent [PendingIntent] to use when a user click the notification.
  * @param context Context of the application.
- *
- * @constructor
+ * @param coroutineScope The [CoroutineScope] used to download image.
  */
 class PillarboxMediaDescriptionAdapter(
     private val pendingIntent: PendingIntent?,
-    context: Context
+    context: Context,
+    private val coroutineScope: CoroutineScope = MainScope()
 ) : MediaDescriptionAdapter {
     private val imageMaxWidth: Int = context.resources.getDimensionPixelSize(R.dimen.compat_notification_large_icon_max_width)
     private val imageMaxHeight: Int = context.resources.getDimensionPixelSize(R.dimen.compat_notification_large_icon_max_height)
@@ -67,11 +69,11 @@ class PillarboxMediaDescriptionAdapter(
                 val imageUri = player.mediaMetadata.artworkUri!!
                 val artworkBitmap = bitmapCache.get(imageUri)
                 if (artworkBitmap == null) {
-                    loadBitmapFromUri(imageUri, callback)
-                    bitmapCache.get(imageUri) // FIXME could return placeholder.
-                } else {
-                    artworkBitmap
+                    coroutineScope.launch(Dispatchers.IO) {
+                        loadBitmapFromUri(imageUri, callback)
+                    }
                 }
+                artworkBitmap // FIXME could return placeholder.
             }
 
             else -> {
@@ -86,16 +88,14 @@ class PillarboxMediaDescriptionAdapter(
             outWidth = imageMaxWidth
             outHeight = imageMaxHeight
         }
-        runBlocking(Dispatchers.IO) {
-            val result = runCatching {
-                imageUrl.openStream().use {
-                    BitmapFactory.decodeStream(it, null, opts)
-                }
-            }
-            result.getOrNull()?.let {
-                bitmapCache.put(imageUri, it)
-                callback.onBitmap(it)
+        val result = runCatching {
+            imageUrl.openStream().use {
+                BitmapFactory.decodeStream(it, null, opts)
             }
         }
+        result.getOrNull()?.let {
+            bitmapCache.put(imageUri, it)
+            callback.onBitmap(it)
+        }
     }
 }

pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/notification/PillarboxMediaDescriptionAdapterTest.kt

@@ -9,12 +9,10 @@ import android.content.Context
 import android.net.Uri
 import androidx.media3.common.MediaMetadata
 import androidx.media3.common.Player
-import androidx.media3.ui.PlayerNotificationManager.BitmapCallback
 import androidx.media3.ui.PlayerNotificationManager.MediaDescriptionAdapter
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.mockk.every
-import io.mockk.justRun
 import io.mockk.mockk
 import org.junit.runner.RunWith
 import org.robolectric.Shadows.shadowOf
@@ -33,7 +31,6 @@ class PillarboxMediaDescriptionAdapterTest {
     @BeforeTest
     fun setup() {
         val context = ApplicationProvider.getApplicationContext<Context>()
-
         pendingIntent = mockk()
         mediaDescriptionAdapter = PillarboxMediaDescriptionAdapter(pendingIntent, context)
     }
@@ -168,24 +165,6 @@ class PillarboxMediaDescriptionAdapterTest {
         assertContentEquals(artworkData, shadowBitmap.createdFromBytes)
     }
 
-    @Test
-    fun `get current large icon, with artworkUri only`() {
-        val artworkUri = "https://source.android.com/static/docs/setup/images/Android_symbol_green_RGB.png"
-        val player = mockk<Player> {
-            every { mediaMetadata } returns MediaMetadata.Builder()
-                .setArtworkUri(Uri.parse(artworkUri))
-                .build()
-        }
-        val bitmapCallback = mockk<BitmapCallback> {
-            justRun { onBitmap(any()) }
-        }
-        val bitmap = mediaDescriptionAdapter.getCurrentLargeIcon(player, bitmapCallback)
-
-        assertNotNull(bitmap)
-        assertEquals(1947, bitmap.width)
-        assertEquals(1043, bitmap.height)
-    }
-
     @Test
     fun `get current large icon, with bad artworkUri only`() {
         val artworkUri = "https://www.example.com/my/image.png"