Added fastest scaling mode

awxkee · Oct 14, 2024 · 7253af4 · 7253af4
1 parent c2ab7ff
commit 7253af4
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 88 deletions.
diff --git a/app/src/main/java/com/radzivon/bartoshyk/avif/MainActivity.kt b/app/src/main/java/com/radzivon/bartoshyk/avif/MainActivity.kt
@@ -122,7 +122,7 @@ class MainActivity : AppCompatActivity() {
             var allFiles = mutableListOf<String>()
             allFiles.addAll(allFiles2)
             allFiles.addAll(allFiles1)
-            allFiles = allFiles.filter { it.contains("test_4.avif") }.toMutableList()
+            allFiles = allFiles.filter { it.contains("output_shot.avif") }.toMutableList()
 //            allFiles = allFiles.filter { it.contains("bbb_alpha_inverted.avif") }.toMutableList()
             for (file in allFiles) {
                 try {
@@ -144,34 +144,15 @@ class MainActivity : AppCompatActivity() {
 
                         var bitmap0 = coder.decodeSampled(
                             byteArray = buffer,
-                            scaledWidth = size.width / 3,
-                            scaledHeight = size.height / 3,
+                            scaledWidth = 325,
+                            scaledHeight = 325,
                             preferredColorConfig = PreferredColorConfig.RGBA_8888,
-                            scaleMode = ScaleMode.FIT,
-                            scaleQuality = ScalingQuality.HIGH,
+                            scaleMode = ScaleMode.FILL,
+                            scaleQuality = ScalingQuality.FASTEST,
                         )
 
 //                        bitmap0.setColorSpace(ColorSpace.getFromDataSpace(DataSpace.DATASPACE_BT2020_PQ)!!)
 
-                        Log.i("AVIF", "Decoding time ${System.currentTimeMillis() - start}")
-
-                        start = System.currentTimeMillis()
-
-                        Log.i("AVIFFFF", "Starts encoding")
-
-                        val encode = coder.encodeHeic(
-                            bitmap = bitmap0,
-                            quality = 25,
-                            preciseMode = PreciseMode.LOSSY,
-                            preset = HeifPreset.VERYSLOW
-                        )
-                        Log.i(
-                            "AVIFFFF",
-                            "Encoding time ${System.currentTimeMillis() - start}, encoded size ${encode.size}"
-                        )
-
-                        val bitmap = coder.decode(encode)
-
                         lifecycleScope.launch(Dispatchers.Main) {
                             val imageView = BindingImageViewBinding.inflate(
                                 layoutInflater,
@@ -181,15 +162,15 @@ class MainActivity : AppCompatActivity() {
                             imageView.root.setImageBitmap(bitmap0)
                             binding.scrollViewContainer.addView(imageView.root)
                         }
-                        lifecycleScope.launch(Dispatchers.Main) {
-                            val imageView = BindingImageViewBinding.inflate(
-                                layoutInflater,
-                                binding.scrollViewContainer,
-                                false
-                            )
-                            imageView.root.setImageBitmap(bitmap)
-                            binding.scrollViewContainer.addView(imageView.root)
-                        }
+//                        lifecycleScope.launch(Dispatchers.Main) {
+//                            val imageView = BindingImageViewBinding.inflate(
+//                                layoutInflater,
+//                                binding.scrollViewContainer,
+//                                false
+//                            )
+//                            imageView.root.setImageBitmap(bitmap)
+//                            binding.scrollViewContainer.addView(imageView.root)
+//                        }
                     }
                 } catch (e: Exception) {
                     Log.d("AVIF", e.toString())

diff --git a/avif-coder/src/main/cpp/AvifDecoderController.cpp b/avif-coder/src/main/cpp/AvifDecoderController.cpp
@@ -80,7 +80,7 @@ AvifImageFrame AvifDecoderController::getFrame(uint32_t frame,
                                                PreferredColorConfig javaColorSpace,
                                                ScaleMode javaScaleMode,
                                                CurveToneMapper toneMapper,
-                                               bool highQualityResizer) {
+                                               int scalingQuality) {
   std::lock_guard guard(this->mutex);
   if (!this->isBufferAttached) {
     throw std::runtime_error("AVIF controller methods can't be called without attached buffer");
@@ -147,7 +147,7 @@ AvifImageFrame AvifDecoderController::getFrame(uint32_t frame,
   imageStore = RescaleSourceImage(avifUniqueImage.rgbImage.pixels, &stride,
                                   bitDepth, isImageRequires64Bit, &imageWidth,
                                   &imageHeight, scaledWidth, scaledHeight, javaScaleMode,
-                                  highQualityResizer);
+                                  scalingQuality);
 
   avifUniqueImage.clear();
 

diff --git a/avif-coder/src/main/cpp/AvifDecoderController.h b/avif-coder/src/main/cpp/AvifDecoderController.h
@@ -59,7 +59,7 @@ class AvifDecoderController {
                           PreferredColorConfig javaColorSpace,
                           ScaleMode javaScaleMode,
                           CurveToneMapper javaToneMapper,
-                          bool highQualityResizer);
+                          int scalingQuality);
   void attachBuffer(uint8_t *data, uint32_t bufferSize);
   uint32_t getFramesCount();
   uint32_t getLoopsCount();

diff --git a/avif-coder/src/main/cpp/HeifImageDecoder.cpp b/avif-coder/src/main/cpp/HeifImageDecoder.cpp
@@ -42,7 +42,7 @@ AvifImageFrame HeifImageDecoder::getFrame(std::vector<uint8_t> &srcBuffer,
                                           PreferredColorConfig javaColorSpace,
                                           ScaleMode javaScaleMode,
                                           CurveToneMapper toneMapper,
-                                          bool highQualityResizer) {
+                                          int scalingQuality) {
   heif_context_set_max_decoding_threads(ctx.get(), (int) std::thread::hardware_concurrency());
 
   auto result = heif_context_read_from_memory_without_copy(ctx.get(), srcBuffer.data(),
@@ -116,7 +116,7 @@ AvifImageFrame HeifImageDecoder::getFrame(std::vector<uint8_t> &srcBuffer,
                                   static_cast<int>(scaledWidth),
                                   static_cast<int>(scaledHeight),
                                   javaScaleMode,
-                                  highQualityResizer);
+                                  scalingQuality);
   if (!scaleResult) {
     throw std::runtime_error("Rescaling an image has failed");
   }

diff --git a/avif-coder/src/main/cpp/HeifImageDecoder.h b/avif-coder/src/main/cpp/HeifImageDecoder.h
@@ -58,7 +58,7 @@ class HeifImageDecoder {
                           PreferredColorConfig javaColorSpace,
                           ScaleMode javaScaleMode,
                           CurveToneMapper javaToneMapper,
-                          bool highQualityResizer);
+                          int scalingQuality);
 
   static std::string getImageType(std::vector<uint8_t> &srcBuffer);
 

diff --git a/avif-coder/src/main/cpp/JniAnimatedController.cpp b/avif-coder/src/main/cpp/JniAnimatedController.cpp
@@ -196,7 +196,7 @@ Java_com_radzivon_bartoshyk_avif_coder_AvifAnimatedDecoder_getFrameImpl(JNIEnv *
                                       preferredColorConfig,
                                       scaleMode,
                                       toneMapper,
-                                      scaleQuality == 2);
+                                      scaleQuality);
 
     int osVersion = androidOSVersion();
 

diff --git a/avif-coder/src/main/cpp/JniDecoder.cpp b/avif-coder/src/main/cpp/JniDecoder.cpp
@@ -49,7 +49,7 @@ jobject decodeImplementationNative(JNIEnv *env, jobject thiz,
                                       preferredColorConfig,
                                       scaleMode,
                                       toneMapper,
-                                      scalingQuality == 2);
+                                      scalingQuality);
     } else {
       HeifImageDecoder heifDecoder;
       frame = heifDecoder.getFrame(srcBuffer,
@@ -58,7 +58,7 @@ jobject decodeImplementationNative(JNIEnv *env, jobject thiz,
                                    preferredColorConfig,
                                    scaleMode,
                                    toneMapper,
-                                   scalingQuality == 2);
+                                   scalingQuality);
     }
 
     int osVersion = androidOSVersion();

diff --git a/avif-coder/src/main/cpp/SizeScaler.cpp b/avif-coder/src/main/cpp/SizeScaler.cpp
@@ -42,7 +42,7 @@ bool RescaleImage(aligned_uint8_vector &initialData,
                   int *stride,
                   bool useFloats,
                   int *imageWidthPtr, int *imageHeightPtr,
-                  int scaledWidth, int scaledHeight, ScaleMode scaleMode, bool highQualityScaling) {
+                  int scaledWidth, int scaledHeight, ScaleMode scaleMode, int scalingQuality) {
   int imageWidth = *imageWidthPtr;
   int imageHeight = *imageHeightPtr;
   if ((scaledHeight != 0 || scaledWidth != 0) && (scaledWidth != 0 && scaledHeight != 0)) {
@@ -105,7 +105,7 @@ bool RescaleImage(aligned_uint8_vector &initialData,
                      scaledWidth * 4,
                      scaledWidth,
                      scaledHeight,
-                     highQualityScaling);
+                     scalingQuality);
     } else {
       outData.resize(scaledHeight * scaledWidth * 4 * sizeof(uint16_t));
       weave_scale_u16(reinterpret_cast<const uint16_t *>(imagePlane),
@@ -116,7 +116,7 @@ bool RescaleImage(aligned_uint8_vector &initialData,
                       scaledWidth,
                       scaledHeight,
                       bitDepth,
-                      highQualityScaling);
+                      scalingQuality);
     }
 
     auto data = outData.data();
@@ -230,7 +230,7 @@ aligned_uint8_vector RescaleSourceImage(uint8_t *sourceData,
                                         uint32_t scaledWidth,
                                         uint32_t scaledHeight,
                                         ScaleMode scaleMode,
-                                        bool highQualityScaling) {
+                                        int scalingQuality) {
   uint32_t imageWidth = *imageWidthPtr;
   uint32_t imageHeight = *imageHeightPtr;
   if ((scaledHeight != 0 || scaledWidth != 0) && (scaledWidth != 0 && scaledHeight != 0)) {
@@ -284,7 +284,7 @@ aligned_uint8_vector RescaleSourceImage(uint8_t *sourceData,
                      scaledWidth * 4,
                      scaledWidth,
                      scaledHeight,
-                     highQualityScaling);
+                     scalingQuality);
     } else {
       outData.resize(scaledHeight * scaledWidth * 4 * sizeof(uint16_t));
       weave_scale_u16(reinterpret_cast<const uint16_t *>(sourceData),
@@ -295,7 +295,7 @@ aligned_uint8_vector RescaleSourceImage(uint8_t *sourceData,
                       scaledWidth,
                       scaledHeight,
                       bitDepth,
-                      highQualityScaling);
+                      scalingQuality);
     }
 
     auto data = outData.data();

diff --git a/avif-coder/src/main/cpp/SizeScaler.h b/avif-coder/src/main/cpp/SizeScaler.h
@@ -46,7 +46,7 @@ bool RescaleImage(aligned_uint8_vector &initialData,
                   int *stride,
                   bool useFloats,
                   int *imageWidthPtr, int *imageHeightPtr,
-                  int scaledWidth, int scaledHeight, ScaleMode scaleMode, bool scalingQuality);
+                  int scaledWidth, int scaledHeight, ScaleMode scaleMode, int scalingQuality);
 
 aligned_uint8_vector RescaleSourceImage(uint8_t *data,
                                         uint32_t *stride,
@@ -57,7 +57,7 @@ aligned_uint8_vector RescaleSourceImage(uint8_t *data,
                                         uint32_t scaledWidth,
                                         uint32_t scaledHeight,
                                         ScaleMode scaleMode,
-                                        bool highQualityScaling);
+                                        int scalingQuality);
 
 std::pair<uint32_t, uint32_t>
 ResizeAspectFit(std::pair<uint32_t, uint32_t> sourceSize,

diff --git a/avif-coder/src/main/cpp/avifweaver.h b/avif-coder/src/main/cpp/avifweaver.h
@@ -1,31 +1,3 @@
-/*
- * MIT License
- *
- * Copyright (c) 2024 Radzivon Bartoshyk
- * avif-coder [/~https://github.com/awxkee/avif-coder]
- *
- * Created by Radzivon Bartoshyk on 13/10/2024
- *
- * 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.
- *
- */
-
 #include <cstdarg>
 #include <cstdint>
 #include <cstdlib>
@@ -42,7 +14,7 @@ void weave_scale_u8(const uint8_t *src,
                     uint32_t dst_stride,
                     uint32_t new_width,
                     uint32_t new_height,
-                    bool high_precision);
+                    uint32_t method);
 
 void weave_scale_u16(const uint16_t *src,
                      uintptr_t src_stride,
@@ -52,6 +24,6 @@ void weave_scale_u16(const uint16_t *src,
                      uint32_t new_width,
                      uint32_t new_height,
                      uintptr_t bit_depth,
-                     bool high_precision);
+                     uint32_t method);
 
 } // extern "C"
diff --git a/avif-coder/src/main/cpp/lib/arm64-v8a/libavifweaver.so b/avif-coder/src/main/cpp/lib/arm64-v8a/libavifweaver.so
diff --git a/avif-coder/src/main/cpp/lib/armeabi-v7a/libavifweaver.so b/avif-coder/src/main/cpp/lib/armeabi-v7a/libavifweaver.so
diff --git a/avif-coder/src/main/cpp/lib/x86/libavifweaver.so b/avif-coder/src/main/cpp/lib/x86/libavifweaver.so
diff --git a/avif-coder/src/main/cpp/lib/x86_64/libavifweaver.so b/avif-coder/src/main/cpp/lib/x86_64/libavifweaver.so
diff --git a/avif-coder/src/main/java/com/radzivon/bartoshyk/avif/coder/ScalingQuality.kt b/avif-coder/src/main/java/com/radzivon/bartoshyk/avif/coder/ScalingQuality.kt
@@ -34,6 +34,11 @@ enum class ScalingQuality(internal val level: Int) {
      */
     DEFAULT(0),
 
+    /**
+     * Nearest neighbors
+     */
+    FASTEST(1),
+
     /**
      * Lanczos 3
      */

diff --git a/avifpixart/build.sh b/avifpixart/build.sh
@@ -28,9 +28,9 @@
 #
 
 set -e
-rustup default nightly
+rustup default stable
 
-rustup +nightly target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi i686-linux-android
+rustup +stable target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi i686-linux-android
 
 RUSTFLAGS="-C target-feature=+neon -C opt-level=2 -C strip=symbols" cargo +stable build --target aarch64-linux-android --release --manifest-path Cargo.toml
 

diff --git a/avifpixart/include/avifweaver.h b/avifpixart/include/avifweaver.h
@@ -14,7 +14,7 @@ void weave_scale_u8(const uint8_t *src,
                     uint32_t dst_stride,
                     uint32_t new_width,
                     uint32_t new_height,
-                    bool high_precision);
+                    uint32_t method);
 
 void weave_scale_u16(const uint16_t *src,
                      uintptr_t src_stride,
@@ -24,6 +24,6 @@ void weave_scale_u16(const uint16_t *src,
                      uint32_t new_width,
                      uint32_t new_height,
                      uintptr_t bit_depth,
-                     bool high_precision);
+                     uint32_t method);
 
 } // extern "C"
diff --git a/avifpixart/src/lib.rs b/avifpixart/src/lib.rs
@@ -40,7 +40,7 @@ pub unsafe extern "C-unwind" fn weave_scale_u8(
     dst_stride: u32,
     new_width: u32,
     new_height: u32,
-    high_precision: bool,
+    method: u32,
 ) {
     let mut src_slice = vec![0u8; width as usize * height as usize * 4];
 
@@ -62,8 +62,10 @@ pub unsafe extern "C-unwind" fn weave_scale_u8(
     let source_store =
         ImageStore::<u8, 4>::new(src_slice, width as usize, height as usize).unwrap();
 
-    let mut scaler = Scaler::new(if high_precision {
+    let mut scaler = Scaler::new(if method == 3 {
         ResamplingFunction::Lanczos3
+    } else if method == 1 {
+        ResamplingFunction::Nearest
     } else {
         ResamplingFunction::Bilinear
     });
@@ -96,7 +98,7 @@ pub unsafe extern "C-unwind" fn weave_scale_u16(
     new_width: u32,
     new_height: u32,
     bit_depth: usize,
-    high_precision: bool,
+    method: u32,
 ) {
     let mut _src_slice = vec![0u16; width as usize * height as usize * 4];
 
@@ -122,8 +124,10 @@ pub unsafe extern "C-unwind" fn weave_scale_u16(
     )
         .unwrap();
 
-    let mut scaler = Scaler::new(if high_precision {
+    let mut scaler = Scaler::new(if method == 3 {
         ResamplingFunction::Lanczos3
+    } else if method == 1 {
+        ResamplingFunction::Nearest
     } else {
         ResamplingFunction::Bilinear
     });