Skip to content

Commit 3387dab

Browse files
awxkeeawxkee
committed
Smal refactor
1 parent 03c4d28 commit 3387dab

File tree

13 files changed

+145
-76
lines changed

13 files changed

+145
-76
lines changed

‎app/src/main/assets/extremly_large.avif‎

3.24 MB
Binary file not shown.

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class MainActivity : AppCompatActivity() {
3131
setContentView(binding.root)
3232

3333
// Example of a call to a native method
34-
binding.sampleText.text = HeifCoder().stringFromJNI()
3534

3635
val buffer = this.assets.open("test_avif.avif").source().buffer().readByteArray()
3736
assert(HeifCoder().isAvif(buffer))
@@ -50,7 +49,8 @@ class MainActivity : AppCompatActivity() {
5049
binding.imageView.setImageBitmap(decodedBitmap)
5150
binding.imageView.setImageBitmap(bitmap)
5251
binding.imageView.setImageBitmap(cc16)
53-
val avif12DepthBuffer = this.assets.open("test_avif_12_bitdepth.avif").source().buffer().readByteArray()
52+
val avif12DepthBuffer =
53+
this.assets.open("test_avif_12_bitdepth.avif").source().buffer().readByteArray()
5454
assert(HeifCoder().isAvif(avif12DepthBuffer))
5555
val avifHDRBitmap = HeifCoder().decode(avif12DepthBuffer)
5656
binding.imageView.setImageBitmap(avifHDRBitmap)
@@ -62,6 +62,12 @@ class MainActivity : AppCompatActivity() {
6262
assert(HeifCoder().getSize(buffer) != null)
6363
val heicScaled = HeifCoder().decodeSampled(heicBuffer, 350, 900)
6464
binding.imageView.setImageBitmap(heicScaled)
65+
val extremlyLargeBitmapBuffer =
66+
this.assets.open("extremly_large.avif").source().buffer().readByteArray()
67+
assert(HeifCoder().isAvif(extremlyLargeBitmapBuffer))
68+
val extremlyLargeBitmap = HeifCoder().decode(extremlyLargeBitmapBuffer)
69+
binding.imageView.setImageBitmap(extremlyLargeBitmap)
70+
6571
// val bytes = HeifCoder().encodeAvif(cc16)
6672
// val ff = File(this.filesDir, "result.avif")
6773
// ff.delete()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
android:id="@+id/imageView"
2121
android:layout_width="0dp"
2222
android:layout_height="0dp"
23-
android:scaleType="fitXY"
23+
android:scaleType="fitCenter"
2424
app:layout_constraintBottom_toBottomOf="parent"
2525
app:layout_constraintEnd_toEndOf="parent"
2626
app:layout_constraintStart_toStartOf="parent"

‎avif-coder-coil/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ afterEvaluate {
1515
mavenJava(MavenPublication) {
1616
groupId = 'com.github.awxkee'
1717
artifactId = 'avif-coder-coil'
18-
version = '1.0.0'
18+
version = '1.0.1'
1919
from components.release
2020
artifact androidSourcesJar
2121
}

‎avif-coder-coil/src/main/java/com/github/awxkee/avifcoil/HeifDecoder.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class HeifDecoder(
7878
private fun aspectScale(sourceSize: Size, dstSize: Size): Size {
7979
val isHorizontal = sourceSize.width > sourceSize.height
8080
val targetSize = if (isHorizontal) dstSize else Size(dstSize.height, dstSize.width)
81-
if (targetSize.width > sourceSize.width && targetSize.width > sourceSize.height) {
81+
if (targetSize.width > sourceSize.width && targetSize.height > sourceSize.height) {
8282
return sourceSize
8383
}
8484
val imageAspectRatio = sourceSize.width.toFloat() / sourceSize.height.toFloat()

‎avif-coder/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ afterEvaluate {
1515
mavenJava(MavenPublication) {
1616
groupId = 'com.github.awxkee'
1717
artifactId = 'avif-coder'
18-
version = '1.0.9'
18+
version = '1.0.13'
1919
from components.release
2020
artifact androidSourcesJar
2121
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ add_library( # Sets the name of the library.
1919
# Sets the library as a shared library.
2020
SHARED
2121
# Provides a relative path to your source file(s).
22-
coder.cpp)
22+
coder.cpp jni_exception.cpp scaler.cpp)
2323

2424
add_library(libaom STATIC IMPORTED)
2525
add_library(libx265 STATIC IMPORTED)
@@ -49,9 +49,6 @@ target_include_directories(coder PRIVATE ${CMAKE_SOURCE_DIR}/libheif ${CMAKE_SOU
4949

5050
find_library( # Sets the name of the path variable.
5151
log-lib
52-
53-
# Specifies the name of the NDK library that
54-
# you want CMake to locate.
5552
log)
5653

5754
# Specifies libraries CMake should link to your target library. You

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

Lines changed: 19 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -7,62 +7,8 @@
77
#include <vector>
88
#include <float.h>
99
#include <arm_fp16.h>
10-
11-
extern "C" JNIEXPORT jstring JNICALL
12-
Java_com_radzivon_bartoshyk_avif_coder_HeifCoder_stringFromJNI(
13-
JNIEnv *env,
14-
jobject /* this */) {
15-
std::string hello = "Hello from C++";
16-
return env->NewStringUTF(hello.c_str());
17-
}
18-
19-
jint throwCannotReadFileException(JNIEnv *env) {
20-
jclass exClass;
21-
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/CantReadHeifFileException");
22-
return env->ThrowNew(exClass, "");
23-
}
24-
25-
jint throwBitDepthException(JNIEnv *env) {
26-
jclass exClass;
27-
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/CorruptedBitDepthException");
28-
return env->ThrowNew(exClass, "");
29-
}
30-
31-
jint throwCoderCreationException(JNIEnv *env) {
32-
jclass exClass;
33-
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/CantCreateCodecException");
34-
return env->ThrowNew(exClass, "");
35-
}
36-
37-
jint throwCantDecodeImageException(JNIEnv *env) {
38-
jclass exClass;
39-
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/CantDecoderImageException");
40-
return env->ThrowNew(exClass, "");
41-
}
42-
43-
jint throwInvalidScale(JNIEnv *env) {
44-
jclass exClass;
45-
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/HeifCantScaleException");
46-
return env->ThrowNew(exClass, "");
47-
}
48-
49-
jint throwCantEncodeImageException(JNIEnv *env) {
50-
jclass exClass;
51-
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/CantEncodeImageException");
52-
return env->ThrowNew(exClass, "");
53-
}
54-
55-
jint throwInvalidPixelsFormat(JNIEnv *env) {
56-
jclass exClass;
57-
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/UnsupportedImageFormatException");
58-
return env->ThrowNew(exClass, "");
59-
}
60-
61-
jint throwPixelsException(JNIEnv *env) {
62-
jclass exClass;
63-
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/GetPixelsException");
64-
return env->ThrowNew(exClass, "");
65-
}
10+
#include "jni_exception.h"
11+
#include "scaler.h"
6612

6713
struct AvifMemEncoder {
6814
std::vector<char> buffer;
@@ -322,7 +268,7 @@ Java_com_radzivon_bartoshyk_avif_coder_HeifCoder_getSizeImpl(JNIEnv *env, jobjec
322268
});
323269
options->convert_hdr_to_8bit = true;
324270
result = heif_decode_image(handle, &img, heif_colorspace_RGB, heif_chroma_interleaved_RGBA,
325-
nullptr);
271+
options.get());
326272
options.reset();
327273
if (result.code != heif_error_Ok) {
328274
heif_image_handle_release(handle);
@@ -392,6 +338,19 @@ Java_com_radzivon_bartoshyk_avif_coder_HeifCoder_decodeImpl(JNIEnv *env, jobject
392338
return static_cast<jobject>(nullptr);
393339
}
394340

341+
// auto totalMemoryImageSize = heif_image_get_width(img, heif_channel_interleaved) *
342+
// heif_image_get_height(img, heif_channel_interleaved) * 4;
343+
// auto maxAvailableMemory = 34 * 1024 * 1024;
344+
//
345+
// if (scaledHeight <= 0 && scaledWidth <= 0 && totalMemoryImageSize > maxAvailableMemory) {
346+
// auto scaledSize = resizeAspect(
347+
// std::pair<int, int>(heif_image_get_width(img, heif_channel_interleaved),
348+
// heif_image_get_height(img, heif_channel_interleaved)),
349+
// std::pair<int, int>(2550, 1440));
350+
// scaledWidth = scaledSize.first;
351+
// scaledHeight = scaledSize.second;
352+
// }
353+
395354
if (scaledHeight > 0 && scaledWidth > 0) {
396355
heif_image *scaledImg;
397356
result = heif_image_scale_image(img, &scaledImg, scaledWidth, scaledHeight, nullptr);
@@ -445,9 +404,9 @@ Java_com_radzivon_bartoshyk_avif_coder_HeifCoder_decodeImpl(JNIEnv *env, jobject
445404
"(IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;");
446405
jobject bitmapObj = env->CallStaticObjectMethod(bitmapClass, createBitmapMethodID,
447406
imageWidth, imageHeight, rgba8888Obj);
448-
auto returningLength = stride * imageHeight;
449-
jintArray pixels = env->NewIntArray(stride * imageHeight);
450-
env->SetIntArrayRegion(pixels, 0, (jsize) returningLength / sizeof(uint32_t),
407+
auto returningLength = stride * imageHeight / sizeof(uint32_t);
408+
jintArray pixels = env->NewIntArray((jsize) returningLength);
409+
env->SetIntArrayRegion(pixels, 0, (jsize) returningLength,
451410
reinterpret_cast<const jint *>(dstARGB.get()));
452411
dstARGB.reset();
453412
jmethodID setPixelsMid = env->GetMethodID(bitmapClass, "setPixels", "([IIIIIII)V");

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
//
2+
// Created by Radzivon Bartoshyk on 01/01/2023.
3+
//
4+
5+
#include "jni_exception.h"
6+
7+
jint throwCannotReadFileException(JNIEnv *env) {
8+
jclass exClass;
9+
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/CantReadHeifFileException");
10+
return env->ThrowNew(exClass, "");
11+
}
12+
13+
jint throwBitDepthException(JNIEnv *env) {
14+
jclass exClass;
15+
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/CorruptedBitDepthException");
16+
return env->ThrowNew(exClass, "");
17+
}
18+
19+
jint throwCoderCreationException(JNIEnv *env) {
20+
jclass exClass;
21+
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/CantCreateCodecException");
22+
return env->ThrowNew(exClass, "");
23+
}
24+
25+
jint throwCantDecodeImageException(JNIEnv *env) {
26+
jclass exClass;
27+
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/CantDecoderImageException");
28+
return env->ThrowNew(exClass, "");
29+
}
30+
31+
jint throwInvalidScale(JNIEnv *env) {
32+
jclass exClass;
33+
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/HeifCantScaleException");
34+
return env->ThrowNew(exClass, "");
35+
}
36+
37+
jint throwCantEncodeImageException(JNIEnv *env) {
38+
jclass exClass;
39+
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/CantEncodeImageException");
40+
return env->ThrowNew(exClass, "");
41+
}
42+
43+
jint throwInvalidPixelsFormat(JNIEnv *env) {
44+
jclass exClass;
45+
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/UnsupportedImageFormatException");
46+
return env->ThrowNew(exClass, "");
47+
}
48+
49+
jint throwPixelsException(JNIEnv *env) {
50+
jclass exClass;
51+
exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/GetPixelsException");
52+
return env->ThrowNew(exClass, "");
53+
}

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// Created by Radzivon Bartoshyk on 01/01/2023.
3+
//
4+
5+
#ifndef AVIF_JNI_EXCEPTION_H
6+
#define AVIF_JNI_EXCEPTION_H
7+
8+
#include <jni.h>
9+
10+
jint throwCannotReadFileException(JNIEnv *env);
11+
jint throwBitDepthException(JNIEnv *env);
12+
jint throwCoderCreationException(JNIEnv *env);
13+
jint throwCantDecodeImageException(JNIEnv *env);
14+
jint throwInvalidScale(JNIEnv *env);
15+
jint throwCantEncodeImageException(JNIEnv *env);
16+
jint throwInvalidPixelsFormat(JNIEnv *env);
17+
jint throwPixelsException(JNIEnv *env);
18+
19+
#endif //AVIF_JNI_EXCEPTION_H

0 commit comments

Comments
 (0)