[Feature] Update Coil and apply MediaMetadataRetriever BitmapParams fix.

niyas-nizar · Oct 2, 2022 · 477e073 · 477e073
1 parent cfb77f0
commit 477e073
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -161,7 +161,7 @@ dependencies {
     implementation 'dev.rikka.rikkax.preference:simplemenu-preference:1.0.3'
     implementation 'dev.rikka.shizuku:api:12.0.0'
     implementation 'eu.agno3.jcifs:jcifs-ng:2.1.6'
-    def coil_version = '2.2.1'
+    def coil_version = '2.2.2'
     implementation "io.coil-kt:coil:$coil_version"
     implementation "io.coil-kt:coil-gif:$coil_version"
     implementation "io.coil-kt:coil-svg:$coil_version"

diff --git a/app/src/main/java/me/zhanghai/android/files/coil/VideoFrameFetcher.kt b/app/src/main/java/me/zhanghai/android/files/coil/VideoFrameFetcher.kt
@@ -20,6 +20,8 @@ import coil.fetch.Fetcher
 import coil.request.Options
 import coil.request.videoFrameOption
 import coil.request.videoFramePercent
+import me.zhanghai.android.files.compat.getFrameAtTimeCompat
+import me.zhanghai.android.files.compat.getScaledFrameAtTimeCompat
 import java.util.concurrent.TimeUnit
 import kotlin.math.roundToInt
 import kotlin.math.roundToLong
@@ -66,6 +68,11 @@ class VideoFrameFetcher(
             )
             val frameOption = options.parameters.videoFrameOption()
                 ?: MediaMetadataRetriever.OPTION_CLOSEST_SYNC
+            val bitmapParams = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                MediaMetadataRetriever.BitmapParams().apply { preferredConfig = options.config }
+            } else {
+                null
+            }
             val outBitmap = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1
                 && srcWidth > 0 && srcHeight > 0) {
                 val dstWidth = options.size.widthPx(options.scale) { srcWidth }
@@ -84,9 +91,11 @@ class VideoFrameFetcher(
                 }
                 val width = (scale * srcWidth).roundToInt()
                 val height = (scale * srcHeight).roundToInt()
-                retriever.getScaledFrameAtTime(frameMicros, frameOption, width, height)
+                retriever.getScaledFrameAtTimeCompat(
+                    frameMicros, frameOption, width, height, bitmapParams
+                )
             } else {
-                retriever.getFrameAtTime(frameMicros, frameOption)?.also {
+                retriever.getFrameAtTimeCompat(frameMicros, frameOption, bitmapParams)?.also {
                     srcWidth = it.width
                     srcHeight = it.height
                 }

diff --git a/app/src/main/java/me/zhanghai/android/files/compat/MediaMetadataRetrieverCompat.kt b/app/src/main/java/me/zhanghai/android/files/compat/MediaMetadataRetrieverCompat.kt
@@ -5,6 +5,7 @@
 
 package me.zhanghai.android.files.compat
 
+import android.graphics.Bitmap
 import android.media.MediaMetadataRetriever
 import android.os.Build
 import androidx.annotation.RequiresApi
@@ -17,6 +18,31 @@ val KClass<MediaMetadataRetriever>.METADATA_KEY_SAMPLERATE: Int
     @RequiresApi(Build.VERSION_CODES.Q)
     get() = 38
 
+fun MediaMetadataRetriever.getFrameAtTimeCompat(
+    timeUs: Long,
+    option: Int,
+    params: MediaMetadataRetriever.BitmapParams?
+): Bitmap? =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && params != null) {
+        getFrameAtTime(timeUs, option, params)
+    } else {
+        getFrameAtTime(timeUs, option)
+    }
+
+@RequiresApi(Build.VERSION_CODES.O_MR1)
+fun MediaMetadataRetriever.getScaledFrameAtTimeCompat(
+    timeUs: Long,
+    option: Int,
+    dstWidth: Int,
+    dstHeight: Int,
+    params: MediaMetadataRetriever.BitmapParams?
+): Bitmap? =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && params != null) {
+        getScaledFrameAtTime(timeUs, option, dstWidth, dstHeight, params)
+    } else {
+        getScaledFrameAtTime(timeUs, option, dstWidth, dstHeight)
+    }
+
 @OptIn(ExperimentalContracts::class)
 inline fun <R> MediaMetadataRetriever.use(block: (MediaMetadataRetriever) -> R): R {
     contract {