mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2026-10-16 13:48:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove libvips based imagedecoder and add progressive rendering (#4023)

Browse Source
This commit is contained in:
w
2026-09-29 03:11:45 +06:00
committed by GitHub
parent 2d1d2e4cab
commit 65d7110e1e
9 changed files with 751 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt
+17 -13
View File
@@ -47,15 +47,16 @@ object ImageUtil {
fun findImageType(stream: InputStream): ImageType? {
return try {
val format = ImageDecoder.new(stream).use { dec -> dec.format }
val format = ImageDecoder.open(stream).use { dec -> dec.format }
when (format) {
"jpeg" -> ImageType.JPEG
"png" -> ImageType.PNG
"webp" -> ImageType.WEBP
"gif" -> ImageType.GIF
"heif" -> ImageType.HEIF
"jxl" -> ImageType.JXL
"jp2" -> ImageType.JP2
ImageDecoder.Format.JPEG -> ImageType.JPEG
ImageDecoder.Format.PNG -> ImageType.PNG
ImageDecoder.Format.WEBP -> ImageType.WEBP
ImageDecoder.Format.GIF -> ImageType.GIF
ImageDecoder.Format.AVIF -> ImageType.AVIF
ImageDecoder.Format.HEIF -> ImageType.HEIF
ImageDecoder.Format.JXL -> ImageType.JXL
ImageDecoder.Format.JP2 -> ImageType.JP2
else -> null
}
} catch (e: Exception) {
@@ -76,7 +77,7 @@ object ImageUtil {
ImageType.GIF -> true
ImageType.WEBP, ImageType.HEIF -> {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return false
ImageDecoder.new(source.peek().inputStream()).use { dec -> dec.pages > 1 }
ImageDecoder.open(source.peek().inputStream()).use { dec -> dec.pages > 1 }
}
else -> false
@@ -303,10 +304,13 @@ object ImageUtil {
*/
fun chooseBackground(context: Context, imageStream: InputStream): Drawable {
val image = try {
ImageDecoder.new(imageStream).use { it.decode() }.let { res ->
createBitmap(res.width, res.height).also { bitmap ->
res.image.rewind()
bitmap.copyPixelsFromBuffer(res.image)
ImageDecoder.open(imageStream).use { it.decodeNext() to it.isHdr }.let { (res, hdr) ->
res.use {
val config = if (hdr) Bitmap.Config.RGBA_F16 else Bitmap.Config.ARGB_8888
createBitmap(res.width, res.height, config).also { bitmap ->
res.image.rewind()
bitmap.copyPixelsFromBuffer(res.image)
}
}
}
} catch (e: Exception) {