Skip to content

Commit a066b32

Browse files
awxkeeawxkee
committed
Added Loseless mode, fix SRGB eotf, fix alpha encoding, fix 100% quality
1 parent 36e5c38 commit a066b32

File tree

22 files changed

+556
-553
lines changed

22 files changed

+556
-553
lines changed

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

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,20 @@ import android.os.Bundle
3232
import android.util.Log
3333
import android.util.Size
3434
import androidx.appcompat.app.AppCompatActivity
35-
import androidx.core.graphics.scale
3635
import androidx.lifecycle.lifecycleScope
3736
import com.radzivon.bartoshyk.avif.coder.HeifCoder
37+
import com.radzivon.bartoshyk.avif.coder.PreciseMode
3838
import com.radzivon.bartoshyk.avif.coder.PreferredColorConfig
3939
import com.radzivon.bartoshyk.avif.coder.ScaleMode
40-
import com.radzivon.bartoshyk.avif.coder.ToneMapper
4140
import com.radzivon.bartoshyk.avif.databinding.ActivityMainBinding
4241
import com.radzivon.bartoshyk.avif.databinding.BindingImageViewBinding
4342
import kotlinx.coroutines.Dispatchers
4443
import kotlinx.coroutines.launch
45-
import okio.FileNotFoundException
4644
import okio.buffer
4745
import okio.sink
4846
import okio.source
4947
import java.io.File
48+
import java.io.FileNotFoundException
5049
import java.io.FileOutputStream
5150
import java.io.IOException
5251

@@ -94,31 +93,64 @@ class MainActivity : AppCompatActivity() {
9493
// HDR EXAMPLES - https://us.zonerama.com/williamskeaguidingphotography/Photo/1000120226/1004888131
9594
lifecycleScope.launch(Dispatchers.IO) {
9695
val coder = HeifCoder()
96+
// val buffer = assets.open("choke_ck.jpg").source().buffer().readByteArray()
97+
// val bitmap = BitmapFactory.decodeByteArray(buffer, 0, buffer.size)
98+
// val encoded = coder.encodeAvif(bitmap, quality = 99, preciseMode = PreciseMode.LOSSLESS)
99+
// val encoded100 = coder.encodeAvif(bitmap, quality = 100)
100+
// val decoded = coder.decode(encoded)
101+
// val decoded100 = coder.decode(encoded100)
102+
// lifecycleScope.launch(Dispatchers.Main) {
103+
// val imageView = BindingImageViewBinding.inflate(layoutInflater, binding.scrollViewContainer, false)
104+
// imageView.root.setImageBitmap(decoded)
105+
// binding.scrollViewContainer.addView(imageView.root)
106+
// }
107+
// lifecycleScope.launch(Dispatchers.Main) {
108+
// val imageView = BindingImageViewBinding.inflate(layoutInflater, binding.scrollViewContainer, false)
109+
// imageView.root.setImageBitmap(bitmap)
110+
// binding.scrollViewContainer.addView(imageView.root)
111+
// }
112+
// lifecycleScope.launch(Dispatchers.Main) {
113+
// val imageView = BindingImageViewBinding.inflate(layoutInflater, binding.scrollViewContainer, false)
114+
// imageView.root.setImageBitmap(decoded100)
115+
// binding.scrollViewContainer.addView(imageView.root)
116+
// }
97117
val allFiles1 = getAllFilesFromAssets().filter { it.contains(".avif") || it.contains(".heic") }
98118
val allFiles2 = getAllFilesFromAssets(path = "hdr").filter { it.contains(".avif") || it.contains(".heic") }
99119
var allFiles = mutableListOf<String>()
100120
allFiles.addAll(allFiles2)
101121
allFiles.addAll(allFiles1)
122+
// allFiles = allFiles.filter { it.contains("blue_lights.avif") || it.contains("bbb_alpha_inverted.avif") }.toMutableList()
123+
// allFiles = allFiles.filter { it.contains("bbb_alpha_inverted.avif") }.toMutableList()
102124
for (file in allFiles) {
103125
try {
104126
Log.d("AVIF", "start processing $file")
105127
val buffer = this@MainActivity.assets.open(file).source().buffer()
106128
.readByteArray()
107129
val size = coder.getSize(buffer)
108130
if (size != null) {
109-
val bitmap = coder.decodeSampled(
110-
buffer,
111-
if (size.width > 1800 || size.height > 1800) size.width / 2 else size.width,
112-
if (size.width > 1800 || size.height > 1800) size.height / 2 else size.height,
113-
PreferredColorConfig.RGBA_8888,
114-
ScaleMode.RESIZE
131+
// val bitmap = coder.decodeSampled(
132+
// buffer,
133+
// if (size.width > 1800 || size.height > 1800) size.width / 2 else size.width,
134+
// if (size.width > 1800 || size.height > 1800) size.height / 2 else size.height,
135+
// PreferredColorConfig.RGBA_1010102,
136+
// ScaleMode.RESIZE
137+
// )
138+
val bitmap = coder.decode(
139+
buffer,
140+
preferredColorConfig = PreferredColorConfig.RGBA_8888,
115141
)
116-
coder.encodeAvif(bitmap)
142+
val encoded = coder.encodeAvif(bitmap)
143+
val decodedEncoded = coder.decode(encoded)
117144
lifecycleScope.launch(Dispatchers.Main) {
118145
val imageView = BindingImageViewBinding.inflate(layoutInflater, binding.scrollViewContainer, false)
119146
imageView.root.setImageBitmap(bitmap)
120147
binding.scrollViewContainer.addView(imageView.root)
121148
}
149+
lifecycleScope.launch(Dispatchers.Main) {
150+
val imageView = BindingImageViewBinding.inflate(layoutInflater, binding.scrollViewContainer, false)
151+
imageView.root.setImageBitmap(decodedEncoded)
152+
binding.scrollViewContainer.addView(imageView.root)
153+
}
122154
}
123155
} catch (e: Exception) {
124156
if (e is FileNotFoundException || e is java.io.FileNotFoundException) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.22.1)
77

88
project("coder")
99

10-
add_library(coder SHARED coder.cpp JniException.cpp SizeScaler.cpp
10+
add_library(coder SHARED JniEncoder.cpp JniException.cpp SizeScaler.cpp
1111
icc/cmsalpha.c icc/cmscam02.c
1212
icc/cmscgats.c icc/cmscnvrt.c icc/cmserr.c icc/cmsgamma.c
1313
icc/cmsgmt.c icc/cmshalf.c icc/cmsintrp.c icc/cmsio0.c

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ jobject decodeImplementationNative(JNIEnv *env, jobject thiz,
236236
heif_transfer_characteristic_ITU_R_BT_601_6) {
237237
function = EOTF_BT601;
238238
} else if (nclx->transfer_characteristics == heif_transfer_characteristic_ITU_R_BT_709_5) {
239-
function = EOTF_SRGB;
239+
function = EOTF_BT709;
240240
} else if (nclx->transfer_characteristics ==
241241
heif_transfer_characteristic_ITU_R_BT_2020_2_10bit ||
242242
nclx->transfer_characteristics ==
@@ -250,16 +250,16 @@ jobject decodeImplementationNative(JNIEnv *env, jobject thiz,
250250
} else if (nclx->transfer_characteristics ==
251251
heif_transfer_characteristic_logarithmic_100_sqrt10) {
252252
function = EOTF_LOG100SRT10;
253-
} else if (
254-
nclx->transfer_characteristics == heif_transfer_characteristic_IEC_61966_2_1 ||
255-
nclx->transfer_characteristics == heif_transfer_characteristic_IEC_61966_2_4) {
253+
} else if (nclx->transfer_characteristics == heif_transfer_characteristic_IEC_61966_2_1) {
254+
function = EOTF_SRGB;
255+
} else if (nclx->transfer_characteristics == heif_transfer_characteristic_IEC_61966_2_4) {
256256
function = EOTF_IEC_61966;
257-
} else if (nclx->transfer_characteristics ==
258-
heif_transfer_characteristic_ITU_R_BT_1361) {
257+
} else if (nclx->transfer_characteristics == heif_transfer_characteristic_ITU_R_BT_1361) {
259258
function = EOTF_BT1361;
260259
} else if (nclx->transfer_characteristics == heif_transfer_characteristic_unspecified) {
261260
function = EOTF_SRGB;
262261
}
262+
ITURColorCoefficients coeffs = colorPrimariesComputeYCoeffs(primaries, whitePoint);
263263
if (useBitmapHalf16Floats) {
264264
coder::GamutAdapter<hwy::float16_t> hdrTransferAdapter(
265265
reinterpret_cast<hwy::float16_t *>(dstARGB.data()),
@@ -268,7 +268,8 @@ jobject decodeImplementationNative(JNIEnv *env, jobject thiz,
268268
toneMapper,
269269
&conversion,
270270
gamma,
271-
getIlluminantD65() != whitePoint);
271+
getIlluminantD65() != whitePoint,
272+
coeffs);
272273
hdrTransferAdapter.transfer();
273274
} else {
274275
coder::GamutAdapter<uint8_t> hdrTransferAdapter(
@@ -278,7 +279,8 @@ jobject decodeImplementationNative(JNIEnv *env, jobject thiz,
278279
toneMapper,
279280
&conversion,
280281
gamma,
281-
getIlluminantD65() != whitePoint);
282+
getIlluminantD65() != whitePoint,
283+
coeffs);
282284
hdrTransferAdapter.transfer();
283285
}
284286
}

0 commit comments

Comments
 (0)