add speed/effort parameter

Author: snowfluke

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 > 0 && speed < 20){
+        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) {
@@ -351,14 +361,15 @@ Java_com_radzivon_bartoshyk_avif_coder_HeifCoder_encodeAvifImpl(JNIEnv *env, job
 extern "C"
 JNIEXPORT jbyteArray JNICALL
 Java_com_radzivon_bartoshyk_avif_coder_HeifCoder_encodeHeicImpl(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_HEVC,
                         quality,
+                        speed,
                         dataSpace,
                         static_cast<AvifQualityMode>(qualityMode));
   } catch (std::bad_alloc &err) {

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

@@ -116,25 +116,25 @@ class HeifCoder(
         )
     }
 
-    fun encodeAvif(bitmap: Bitmap, quality: Int = 80, preciseMode: PreciseMode = PreciseMode.LOSSY): ByteArray {
+    fun encodeAvif(bitmap: Bitmap, quality: Int = 80, speed: Int = 0, 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, bitmap.colorSpace?.dataSpace ?: -1, preciseMode.value)
         } else {
-            encodeAvifImpl(bitmap, quality, -1, preciseMode.value)
+            encodeAvifImpl(bitmap, quality, speed, -1, preciseMode.value)
         }
     }
 
-    fun encodeHeic(bitmap: Bitmap, quality: Int = 80, preciseMode: PreciseMode = PreciseMode.LOSSY): ByteArray {
+    fun encodeHeic(bitmap: Bitmap, quality: Int = 80, speed: Int = 0, 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) {
-            encodeHeicImpl(bitmap, quality, bitmap.colorSpace?.dataSpace ?: -1, preciseMode.value)
+            encodeHeicImpl(bitmap, quality, speed, bitmap.colorSpace?.dataSpace ?: -1, preciseMode.value)
         } else {
-            encodeHeicImpl(bitmap, quality, -1, preciseMode.value)
+            encodeHeicImpl(bitmap, quality, speed, -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 {