JpegXL support

This commit is contained in:
Jays2Kings 2022-07-05 18:13:18 -04:00
parent 397699c1e2
commit f7cddd25c5
3 changed files with 3 additions and 12 deletions

View file

@ -48,15 +48,6 @@ android {
ndk { ndk {
abiFilters += supportedAbis abiFilters += supportedAbis
} }
packagingOptions {
jniLibs.excludes.addAll(
listOf(
"**/libjxl.so",
"**/libjxl_dec.so",
"**/libjxl_threads.so",
)
)
}
externalNativeBuild { externalNativeBuild {
cmake { cmake {
this.arguments("-DHAVE_LIBJXL=FALSE") this.arguments("-DHAVE_LIBJXL=FALSE")

View file

@ -48,7 +48,7 @@ class TachiyomiImageDecoder(private val resources: ImageSource, private val opti
ImageUtil.findImageType(it) ImageUtil.findImageType(it)
} }
return when (type) { return when (type) {
ImageUtil.ImageType.AVIF/*, ImageUtil.ImageType.JXL */ -> true ImageUtil.ImageType.AVIF, ImageUtil.ImageType.JXL -> true
ImageUtil.ImageType.HEIF -> Build.VERSION.SDK_INT < Build.VERSION_CODES.O ImageUtil.ImageType.HEIF -> Build.VERSION.SDK_INT < Build.VERSION_CODES.O
else -> false else -> false
} }

View file

@ -53,7 +53,7 @@ object ImageUtil {
Format.Gif -> ImageType.GIF Format.Gif -> ImageType.GIF
Format.Heif -> ImageType.HEIF Format.Heif -> ImageType.HEIF
Format.Jpeg -> ImageType.JPEG Format.Jpeg -> ImageType.JPEG
// Format.Jxl -> ImageType.JXL Format.Jxl -> ImageType.JXL
Format.Png -> ImageType.PNG Format.Png -> ImageType.PNG
Format.Webp -> ImageType.WEBP Format.Webp -> ImageType.WEBP
else -> null else -> null
@ -95,7 +95,7 @@ object ImageUtil {
HEIF("image/heif", "heif"), HEIF("image/heif", "heif"),
JPEG("image/jpeg", "jpg"), JPEG("image/jpeg", "jpg"),
// JXL("image/jxl", "jxl"), JXL("image/jxl", "jxl"),
PNG("image/png", "png"), PNG("image/png", "png"),
WEBP("image/webp", "webp"), WEBP("image/webp", "webp"),
} }