Merge pull request #21 from snowfluke/master

Add speed/effort parameter

Author: awxkee

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

@@ -79,7 +79,7 @@ struct heif_error writeHeifData(struct heif_context *ctx,
 
 jbyteArray encodeBitmap(JNIEnv *env, jobject thiz,
                         jobject bitmap, heif_compression_format heifCompressionFormat,
-                        const int quality, const int dataSpace, const AvifQualityMode qualityMode) {
+                        const int quality, const int speed, const int dataSpace, const AvifQualityMode qualityMode) {
   std::shared_ptr<heif_context> ctx(heif_context_alloc(),
                                     [](heif_context *c) { heif_context_free(c); });
   if (!ctx) {
@@ -114,6 +114,15 @@ jbyteArray encodeBitmap(JNIEnv *env, jobject thiz,
         throwException(env, str);
         return static_cast<jbyteArray>(nullptr);
       }
+      if(speed > -1 && speed <= 10){
+        result = heif_encoder_set_parameter_string(encoder.get(), "speed", speed)
+        if (result.code != heif_error_Ok) {
+          std::string choke(result.message);
+          std::string str = "Can't set speed/effort: " + choke;
+          throwException(env, str);
+          return static_cast<jbyteArray>(nullptr);
+        }
+      }
     }
   } else if (qualityMode == AVIF_LOSELESS_MODE) {
     result = heif_encoder_set_lossless(encoder.get(), true);
@@ -331,14 +340,15 @@ jbyteArray encodeBitmap(JNIEnv *env, jobject thiz,
 extern "C"
 JNIEXPORT jbyteArray JNICALL
 Java_com_radzivon_bartoshyk_avif_coder_HeifCoder_encodeAvifImpl(JNIEnv *env, jobject thiz,
-                                                                jobject bitmap, jint quality,
+                                                                jobject bitmap, jint quality, jint speed,
                                                                 jint dataSpace, jint qualityMode) {
   try {
     return encodeBitmap(env,
                         thiz,
                         bitmap,
                         heif_compression_AV1,
                         quality,
+                        speed,
                         dataSpace,
                         static_cast<AvifQualityMode>(qualityMode));
   } catch (std::bad_alloc &err) {
@@ -359,6 +369,7 @@ Java_com_radzivon_bartoshyk_avif_coder_HeifCoder_encodeHeicImpl(JNIEnv *env, job
                         bitmap,
                         heif_compression_HEVC,
                         quality,
+                        0,
                         dataSpace,
                         static_cast<AvifQualityMode>(qualityMode));
   } catch (std::bad_alloc &err) {

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

@@ -0,0 +1,51 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Radzivon Bartoshyk
+ * avif-coder [https://github.com/awxkee/avif-coder]
+ *
+ * Created by Radzivon Bartoshyk on 23/9/2023
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package com.radzivon.bartoshyk.avif.coder
+
+/**
+ * Enum representing speed values from 0 to 10 (slowest-fastest).
+ * Default is 6.
+ * https://github.com/AOMediaCodec/libavif/blob/main/doc/avifenc.1.md
+ */
+enum class AvifSpeed(internal val value: Int) {
+    ZERO(0),  // Speed 0
+    ONE(1),   // Speed 1
+    TWO(2),   // Speed 2
+    THREE(3), // Speed 3
+    FOUR(4),  // Speed 4
+    FIVE(5),  // Speed 5
+    SIX(6),   // Speed 6
+    SEVEN(7), // Speed 7
+    EIGHT(8), // Speed 8
+    NINE(9),  // Speed 9
+    TEN(10)   // Speed 10
+
+    // Not using speed parameter, fallback to use x265 instead of aom
+    USE_X265(-1)
+}

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

@@ -116,14 +116,14 @@ class HeifCoder(
         )
     }
 
-    fun encodeAvif(bitmap: Bitmap, quality: Int = 80, preciseMode: PreciseMode = PreciseMode.LOSSY): ByteArray {
+    fun encodeAvif(bitmap: Bitmap, quality: Int = 80, speed: AvifSpeed = AvifSpeed.SIX, preciseMode: PreciseMode = PreciseMode.LOSSY): ByteArray {
         require(quality in 0..100) {
             throw IllegalStateException("Quality should be in 0..100 range")
         }
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            encodeAvifImpl(bitmap, quality, bitmap.colorSpace?.dataSpace ?: -1, preciseMode.value)
+            encodeAvifImpl(bitmap, quality, speed.value, bitmap.colorSpace?.dataSpace ?: -1, preciseMode.value)
         } else {
-            encodeAvifImpl(bitmap, quality, -1, preciseMode.value)
+            encodeAvifImpl(bitmap, quality, speed.value, -1, preciseMode.value)
         }
     }
 
@@ -163,8 +163,8 @@ class HeifCoder(
         toneMapper: Int,
     ): Bitmap
 
-    private external fun encodeAvifImpl(bitmap: Bitmap, quality: Int, dataSpace: Int, qualityMode: Int): ByteArray
-    private external fun encodeHeicImpl(bitmap: Bitmap, quality: Int, dataSpace: Int, qualityMode: Int): ByteArray
+    private external fun encodeAvifImpl(bitmap: Bitmap, quality: Int, speed: Int, dataSpace: Int, qualityMode: Int): ByteArray
+    private external fun encodeHeicImpl(bitmap: Bitmap, quality: Int, speed: Int, dataSpace: Int, qualityMode: Int): ByteArray
 
     @SuppressLint("ObsoleteSdkInt")
     companion object {