musikr: introduce cover params

app/src/main/java/org/oxycblt/auxio/music/RevisionedCovers.kt

@@ -25,6 +25,7 @@ import kotlinx.coroutines.withContext
 import org.oxycblt.musikr.cover.Cover
 import org.oxycblt.musikr.cover.CoverFiles
 import org.oxycblt.musikr.cover.CoverFormat
+import org.oxycblt.musikr.cover.CoverParams
 import org.oxycblt.musikr.cover.MutableStoredCovers
 import org.oxycblt.musikr.cover.StoredCovers
 
@@ -47,7 +48,8 @@ class RevisionedCovers(private val revision: UUID, private val inner: MutableSto
                     context.filesDir.resolve("covers/${revision}").apply { mkdirs() }
                 }
             return RevisionedCovers(
-                revision, StoredCovers.from(CoverFiles.at(dir), CoverFormat.jpeg()))
+                revision,
+                StoredCovers.from(CoverFiles.at(dir), CoverFormat.jpeg(CoverParams.of(750, 80))))
         }
 
         suspend fun cleanup(context: Context, exclude: UUID) =

musikr/src/main/java/org/oxycblt/musikr/cover/CoverFormat.kt

@@ -28,37 +28,24 @@ abstract class CoverFormat {
     internal abstract fun transcodeInto(data: ByteArray, output: OutputStream): Boolean
 
     companion object {
-        // Enable if perhaps you want to try other formats.
+        fun jpeg(params: CoverParams): CoverFormat =
-        // Currently this is just far too slow.
+            CoverFormatImpl("jpg", params, Bitmap.CompressFormat.JPEG)
-        //        fun webp(): CoverFormat = CoverFormatImpl(
-        //            "webp",
-        //            750,
-        //            80,
-        //            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-        //                Bitmap.CompressFormat.WEBP_LOSSY
-        //            } else {
-        //                Bitmap.CompressFormat.WEBP
-        //            }
-        //        )
-
-        fun jpeg(): CoverFormat = CoverFormatImpl("jpg", 1000, 100, Bitmap.CompressFormat.JPEG)
     }
 }
 
 private class CoverFormatImpl(
     override val extension: String,
-    val size: Int,
+    private val params: CoverParams,
-    val quality: Int,
+    private val format: Bitmap.CompressFormat,
-    val format: Bitmap.CompressFormat,
 ) : CoverFormat() {
     override fun transcodeInto(data: ByteArray, output: OutputStream) =
         BitmapFactory.Options().run {
             inJustDecodeBounds = true
             BitmapFactory.decodeByteArray(data, 0, data.size, this)
-            inSampleSize = calculateInSampleSize(size)
+            inSampleSize = calculateInSampleSize(params.resolution)
             inJustDecodeBounds = false
             val bitmap = BitmapFactory.decodeByteArray(data, 0, data.size, this) ?: return@run false
-            bitmap.compress(format, quality, output)
+            bitmap.compress(format, params.quality, output)
             true
         }
 

musikr/src/main/java/org/oxycblt/musikr/cover/CoverParams.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2024 Auxio Project
+ * CoverParams.kt is part of Auxio.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package org.oxycblt.musikr.cover
+
+class CoverParams private constructor(internal val resolution: Int, internal val quality: Int) {
+    companion object {
+        fun of(resolution: Int, quality: Int): CoverParams {
+            check(resolution > 0) { "Resolution must be positive" }
+            check(quality in 0..100) { "Quality must be between 0 and 100" }
+            return CoverParams(resolution, quality)
+        }
+    }
+}