Skip to content

Commit 47d0a57

Browse files
awxkeeawxkee
committed
Small improvements
1 parent dab60e8 commit 47d0a57

File tree

10 files changed

+176
-26
lines changed

10 files changed

+176
-26
lines changed

‎app/build.gradle‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id 'com.android.application'
33
id 'org.jetbrains.kotlin.android'
4+
id 'com.google.devtools.ksp'
45
}
56

67
android {
@@ -24,11 +25,11 @@ android {
2425
}
2526
}
2627
compileOptions {
27-
sourceCompatibility JavaVersion.VERSION_1_8
28-
targetCompatibility JavaVersion.VERSION_1_8
28+
sourceCompatibility JavaVersion.VERSION_17
29+
targetCompatibility JavaVersion.VERSION_17
2930
}
3031
kotlinOptions {
31-
jvmTarget = '1.8'
32+
jvmTarget = '17'
3233
}
3334
externalNativeBuild {
3435
cmake {
@@ -54,4 +55,6 @@ dependencies {
5455
implementation("com.squareup.okio:okio:3.3.0")
5556
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
5657
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
58+
implementation 'com.github.bumptech.glide:glide:4.16.0'
59+
ksp 'com.github.bumptech.glide:ksp:4.16.0'
5760
}

‎app/src/main/java/com/radzivon/bartoshyk/avif/MainActivity.kt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import androidx.core.graphics.scale
1313
import androidx.lifecycle.lifecycleScope
1414
import coil.ImageLoader
1515
import coil.load
16+
import com.bumptech.glide.Glide
17+
import com.bumptech.glide.load.engine.DiskCacheStrategy
1618
import com.github.awxkee.avifcoil.HeifDecoder
1719
import com.radzivon.bartoshyk.avif.coder.HeifCoder
1820
import com.radzivon.bartoshyk.avif.coder.PreferredColorConfig
@@ -42,6 +44,7 @@ class MainActivity : AppCompatActivity() {
4244
val buffer = this.assets.open("federico-beccari-hlg.avif").source().buffer().readByteArray()
4345
// assert(HeifCoder().isAvif(buffer))
4446
val size = HeifCoder().getSize(buffer)!!
47+
assert(size != null)
4548
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
4649
val time = measureTimeMillis {
4750
// val bitmap = HeifCoder().decodeSampled(
@@ -73,6 +76,11 @@ class MainActivity : AppCompatActivity() {
7376
//https://wh.aimuse.online/creatives/IMUSE_03617fe2db82a584166_27/TT_a9d21ff1061d785347935fef/68f06252.avif
7477
//https://wh.aimuse.online/preset/federico-beccari.avif
7578

79+
// Glide.with(this)
80+
// .load("https://wh.aimuse.online/preset/avif10bit.avif")
81+
// .skipMemoryCache(true)
82+
// .into(binding.imageView)
83+
7684
// binding.imageView.load("https://wh.aimuse.online/preset/avif10bit.avif",
7785
// imageLoader = ImageLoader.Builder(this)
7886
// .components {

‎app/src/main/java/com/radzivon/bartoshyk/avif/glide/AvifCoderByteBufferDecoder.kt‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
package com.radzivon.bartoshyk.avif.glide
2+
3+
import android.graphics.Bitmap
4+
import android.os.Build
5+
import com.bumptech.glide.load.DecodeFormat
6+
import com.bumptech.glide.load.Options
7+
import com.bumptech.glide.load.ResourceDecoder
8+
import com.bumptech.glide.load.engine.Resource
9+
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool
10+
import com.bumptech.glide.load.resource.bitmap.BitmapResource
11+
import com.bumptech.glide.load.resource.bitmap.Downsampler
12+
import com.bumptech.glide.request.target.Target
13+
import com.radzivon.bartoshyk.avif.coder.HeifCoder
14+
import com.radzivon.bartoshyk.avif.coder.PreferredColorConfig
15+
import com.radzivon.bartoshyk.avif.coder.ScaleMode
16+
import java.nio.ByteBuffer
17+
18+
class AvifCoderByteBufferDecoder(private val bitmapPool: BitmapPool) :
19+
ResourceDecoder<ByteBuffer, Bitmap> {
20+
21+
private val coder = HeifCoder()
22+
23+
override fun handles(source: ByteBuffer, options: Options): Boolean {
24+
return coder.isSupportedImage(source)
25+
}
26+
27+
override fun decode(
28+
source: ByteBuffer,
29+
width: Int,
30+
height: Int,
31+
options: Options
32+
): Resource<Bitmap>? {
33+
val src = refactorToDirect(source)
34+
val allowedHardwareConfig = options[Downsampler.ALLOW_HARDWARE_CONFIG] ?: false
35+
Downsampler.FIX_BITMAP_SIZE_TO_REQUESTED_DIMENSIONS
36+
37+
var idealWidth = width
38+
if (idealWidth == Target.SIZE_ORIGINAL) {
39+
idealWidth = -1
40+
}
41+
var idealHeight = height
42+
if (idealHeight == Target.SIZE_ORIGINAL) {
43+
idealHeight = -1
44+
}
45+
46+
val preferredColorConfig: PreferredColorConfig = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && allowedHardwareConfig) {
47+
PreferredColorConfig.HARDWARE
48+
} else {
49+
if (options[Downsampler.DECODE_FORMAT] === DecodeFormat.PREFER_RGB_565) {
50+
PreferredColorConfig.RGB_565
51+
} else {
52+
PreferredColorConfig.DEFAULT
53+
}
54+
}
55+
56+
val bitmap =
57+
coder.decodeSampled(src, idealWidth, idealHeight, preferredColorConfig, ScaleMode.FIT)
58+
59+
return BitmapResource.obtain(bitmap, bitmapPool)
60+
}
61+
62+
private fun refactorToDirect(source: ByteBuffer): ByteBuffer {
63+
if (source.isDirect) {
64+
return source
65+
}
66+
val sourceCopy = ByteBuffer.allocateDirect(source.remaining())
67+
sourceCopy.put(source)
68+
sourceCopy.flip()
69+
return sourceCopy
70+
}
71+
72+
}

‎app/src/main/java/com/radzivon/bartoshyk/avif/glide/AvifCoderStreamDecoder.kt‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.radzivon.bartoshyk.avif.glide
2+
3+
import android.graphics.Bitmap
4+
import com.bumptech.glide.load.Options
5+
import com.bumptech.glide.load.ResourceDecoder
6+
import com.bumptech.glide.load.engine.Resource
7+
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool
8+
import com.bumptech.glide.util.ByteBufferUtil
9+
import java.io.InputStream
10+
11+
class AvifCoderStreamDecoder(private val bitmapPool: BitmapPool) :
12+
ResourceDecoder<InputStream, Bitmap> {
13+
14+
private val byteBufferDecoder = AvifCoderByteBufferDecoder(bitmapPool)
15+
16+
override fun handles(source: InputStream, options: Options): Boolean {
17+
val bb = ByteBufferUtil.fromStream(source)
18+
source.reset()
19+
return byteBufferDecoder.handles(bb, options)
20+
}
21+
22+
override fun decode(
23+
source: InputStream,
24+
width: Int,
25+
height: Int,
26+
options: Options
27+
): Resource<Bitmap>? {
28+
val bb = ByteBufferUtil.fromStream(source)
29+
source.reset()
30+
return byteBufferDecoder.decode(bb, width, height, options)
31+
}
32+
}

‎app/src/main/java/com/radzivon/bartoshyk/avif/glide/AvifGlideModule.kt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.radzivon.bartoshyk.avif.glide
2+
3+
import android.content.Context
4+
import android.graphics.Bitmap
5+
import com.bumptech.glide.Glide
6+
import com.bumptech.glide.Registry
7+
import com.bumptech.glide.annotation.GlideModule
8+
import com.bumptech.glide.module.LibraryGlideModule
9+
import java.io.InputStream
10+
import java.nio.ByteBuffer
11+
12+
@GlideModule
13+
class AvifCoderGlideModule : LibraryGlideModule() {
14+
override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
15+
// Add the Avif ResourceDecoders before any of the available system decoders. This ensures that
16+
// the integration will be preferred for Avif images.
17+
val byteBufferBitmapDecoder = AvifCoderByteBufferDecoder(glide.bitmapPool)
18+
registry.prepend(ByteBuffer::class.java, Bitmap::class.java, byteBufferBitmapDecoder)
19+
val streamBitmapDecoder = AvifCoderStreamDecoder(glide.bitmapPool)
20+
registry.prepend(InputStream::class.java, Bitmap::class.java, streamBitmapDecoder)
21+
}
22+
}

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
<ImageView
2020
android:id="@+id/imageView"
21-
android:layout_width="240dp"
22-
android:layout_height="320dp"
23-
android:scaleType="centerCrop"
21+
android:layout_width="wrap_content"
22+
android:layout_height="wrap_content"
23+
android:scaleType="fitCenter"
2424
app:layout_constraintBottom_toBottomOf="parent"
2525
app:layout_constraintEnd_toEndOf="parent"
2626
app:layout_constraintStart_toStartOf="parent"

‎avif-coder/src/main/cpp/JniDecoder.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "JniBitmap.h"
2929
#include "ReformatBitmap.h"
3030
#include "IccRecognizer.h"
31+
#include "thread"
3132

3233
jobject decodeImplementationNative(JNIEnv *env, jobject thiz,
3334
std::vector<uint8_t> &srcBuffer, jint scaledWidth,
@@ -47,6 +48,8 @@ jobject decodeImplementationNative(JNIEnv *env, jobject thiz,
4748
return static_cast<jobject>(nullptr);
4849
}
4950

51+
heif_context_set_max_decoding_threads(ctx.get(), (int)std::thread::hardware_concurrency());
52+
5053
auto result = heif_context_read_from_memory_without_copy(ctx.get(), srcBuffer.data(),
5154
srcBuffer.size(),
5255
nullptr);

‎avif-coder/src/main/cpp/coder.cpp‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -387,30 +387,34 @@ Java_com_radzivon_bartoshyk_avif_coder_HeifCoder_getSizeImpl(JNIEnv *env, jobjec
387387
throwBitDepthException(env);
388388
return static_cast<jobject>(nullptr);
389389
}
390-
heif_image *img;
391-
std::shared_ptr<heif_decoding_options> options(heif_decoding_options_alloc(),
392-
[](heif_decoding_options *deo) {
393-
heif_decoding_options_free(deo);
394-
});
395-
options->convert_hdr_to_8bit = true;
396-
result = heif_decode_image(handle, &img, heif_colorspace_RGB, heif_chroma_interleaved_RGBA,
397-
options.get());
398-
options.reset();
399-
if (result.code != heif_error_Ok) {
400-
heif_image_handle_release(handle);
401-
std::string exception = "Decode an image has failed";
402-
throwException(env, exception);
403-
return static_cast<jobject>(nullptr);
404-
}
405-
406-
auto width = heif_image_get_primary_width(img);
407-
auto height = heif_image_get_primary_height(img);
408-
409-
heif_image_release(img);
390+
auto width = heif_image_handle_get_width(handle);
391+
auto height = heif_image_handle_get_height(handle);
410392
heif_image_handle_release(handle);
411393

412394
jclass sizeClass = env->FindClass("android/util/Size");
413395
jmethodID methodID = env->GetMethodID(sizeClass, "<init>", "(II)V");
414396
auto sizeObject = env->NewObject(sizeClass, methodID, width, height);
415397
return sizeObject;
398+
}
399+
400+
401+
extern "C"
402+
JNIEXPORT jboolean JNICALL
403+
Java_com_radzivon_bartoshyk_avif_coder_HeifCoder_isSupportedImageImplBB(JNIEnv *env, jobject thiz,
404+
jobject byteBuffer) {
405+
auto bufferAddress = reinterpret_cast<uint8_t *>(env->GetDirectBufferAddress(byteBuffer));
406+
int length = (int) env->GetDirectBufferCapacity(byteBuffer);
407+
if (!bufferAddress || length <= 0) {
408+
std::string errorString = "Only direct byte buffers are supported";
409+
throwException(env, errorString);
410+
return (jboolean) false;
411+
}
412+
std::vector<uint8_t> srcBuffer(length);
413+
std::copy(bufferAddress, bufferAddress + length, srcBuffer.begin());
414+
auto cMime = heif_get_file_mime_type(reinterpret_cast<const uint8_t *>(srcBuffer.data()),
415+
(int)srcBuffer.size());
416+
std::string mime(cMime);
417+
return mime == "image/heic" || mime == "image/heif" ||
418+
mime == "image/heic-sequence" || mime == "image/heif-sequence" ||
419+
mime == "image/avif" || mime == "image/avif-sequence";
416420
}

‎avif-coder/src/main/java/com/radzivon/bartoshyk/avif/coder/HeifCoder.kt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ class HeifCoder {
2525
return isSupportedImageImpl(byteArray)
2626
}
2727

28+
fun isSupportedImage(byteBuffer: ByteBuffer): Boolean {
29+
return isSupportedImageImplBB(byteBuffer)
30+
}
31+
2832
fun getSize(bytes: ByteArray): Size? {
2933
return getSizeImpl(bytes)
3034
}
@@ -86,6 +90,7 @@ class HeifCoder {
8690
private external fun isHeifImageImpl(byteArray: ByteArray): Boolean
8791
private external fun isAvifImageImpl(byteArray: ByteArray): Boolean
8892
private external fun isSupportedImageImpl(byteArray: ByteArray): Boolean
93+
private external fun isSupportedImageImplBB(byteBuffer: ByteBuffer): Boolean
8994
private external fun decodeImpl(
9095
byteArray: ByteArray,
9196
scaledWidth: Int,

‎build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ plugins {
33
id 'com.android.application' version '8.1.1' apply false
44
id 'com.android.library' version '8.1.1' apply false
55
id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
6+
id 'com.google.devtools.ksp' version '1.8.10-1.0.9' apply false
67
}

0 commit comments

Comments
 (0)