Remove omp

Author: awxkee

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

@@ -98,7 +98,7 @@ class MainActivity : AppCompatActivity() {
             var allFiles = mutableListOf<String>()
             allFiles.addAll(allFiles2)
             allFiles.addAll(allFiles1)
-//            allFiles = allFiles.filter { it.contains("test_avif.avif") }.toMutableList()
+            allFiles = allFiles.takeLast(4).toMutableList()
             for (file in allFiles) {
                 try {
                     val buffer = this@MainActivity.assets.open(file).source().buffer()
@@ -109,9 +109,10 @@ class MainActivity : AppCompatActivity() {
                                 buffer,
                                 if (size.width > 1800 || size.height > 1800) size.width / 2 else size.width,
                                 if (size.width > 1800 || size.height > 1800) size.height / 2 else size.height,
-                                PreferredColorConfig.HARDWARE,
+                                PreferredColorConfig.RGBA_8888,
                                 ScaleMode.RESIZE
                         )
+                        coder.encodeAvif(bitmap)
                         lifecycleScope.launch(Dispatchers.Main) {
                             val imageView = BindingImageViewBinding.inflate(layoutInflater, binding.scrollViewContainer, false)
                             imageView.root.setImageBitmap(bitmap)

avif-coder/build.gradle.kts

@@ -42,7 +42,7 @@ afterEvaluate {
             create<MavenPublication>("mavenJava") {
                 groupId = "com.github.awxkee"
                 artifactId = "avif-coder"
-                version = "1.6.0"
+                version = "1.6.2"
                 from(components["release"])
 //                artifact("androidSourcesJar")
             }
@@ -70,8 +70,6 @@ android {
                 cppFlags.addAll(
                     listOf(
                         "-std=c++20",
-                        "-fopenmp",
-                        "-static-openmp"
                     )
                 )
                 abiFilters += setOf("armeabi-v7a", "arm64-v8a", "x86_64", "x86")

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

@@ -77,6 +77,5 @@ include_directories(icc)
 
 target_link_libraries( # Specifies the target library.
         coder
-        -static-openmp
         ${log-lib} libaom libx265 libheif cpufeatures libyuv -ljnigraphics
         libde265 libdav1d libsharpyuv ${android-lib})

avif-coder/src/main/cpp/imagebits/RGBAlpha.cpp

@@ -81,17 +81,18 @@ namespace coder::HWY_NAMESPACE {
     void UnpremultiplyRGBA_HWY(const uint8_t *src, int srcStride,
                                uint8_t *dst, int dstStride, int width,
                                int height) {
-        const FixedTag<uint8_t, 16> du8x16;
-        const FixedTag<uint16_t, 8> du16x8;
-        const FixedTag<uint8_t, 8> du8x8;
+#pragma omp parallel for num_threads(4) schedule(dynamic)
+        for (int y = 0; y < height; ++y) {
 
-        using VU8x16 = Vec<decltype(du8x16)>;
-        using VU16x8 = Vec<decltype(du16x8)>;
+            const FixedTag<uint8_t, 16> du8x16;
+            const FixedTag<uint16_t, 8> du16x8;
+            const FixedTag<uint8_t, 8> du8x8;
 
-        VU16x8 mult255 = Set(du16x8, 255);
+            using VU8x16 = Vec<decltype(du8x16)>;
+            using VU16x8 = Vec<decltype(du16x8)>;
+
+            VU16x8 mult255 = Set(du16x8, 255);
 
-#pragma omp parallel for num_threads(4) schedule(dynamic)
-        for (int y = 0; y < height; ++y) {
             auto mSrc = reinterpret_cast<const uint8_t *>(src + y * srcStride);
             auto mDst = reinterpret_cast<uint8_t *>(dst + y * dstStride);
 
@@ -191,17 +192,18 @@ namespace coder::HWY_NAMESPACE {
     void PremultiplyRGBA_HWY(const uint8_t *src, int srcStride,
                              uint8_t *dst, int dstStride, int width,
                              int height) {
-        const FixedTag<uint8_t, 16> du8x16;
-        const FixedTag<uint16_t, 8> du16x8;
-        const FixedTag<uint8_t, 8> du8x8;
+#pragma omp parallel for num_threads(4) schedule(dynamic)
+        for (int y = 0; y < height; ++y) {
 
-        using VU8x16 = Vec<decltype(du8x16)>;
-        using VU16x8 = Vec<decltype(du16x8)>;
+            const FixedTag<uint8_t, 16> du8x16;
+            const FixedTag<uint16_t, 8> du16x8;
+            const FixedTag<uint8_t, 8> du8x8;
 
-        VU16x8 mult255d2 = Set(du16x8, 255 / 2);
+            using VU8x16 = Vec<decltype(du8x16)>;
+            using VU16x8 = Vec<decltype(du16x8)>;
+
+            VU16x8 mult255d2 = Set(du16x8, 255 / 2);
 
-#pragma omp parallel for num_threads(4) schedule(dynamic)
-        for (int y = 0; y < height; ++y) {
             auto mSrc = reinterpret_cast<const uint8_t *>(src + y * srcStride);
             auto mDst = reinterpret_cast<uint8_t *>(dst + y * dstStride);