1.7.2 Release

统一打印realsr/realcugan保存图片所用的时间

Author: tumuyan

RealCUGAN-NCNN-Android-CLI/app/build.gradle

@@ -9,7 +9,7 @@ android {
 
         ndk {
             moduleName "ncnn"
-            abiFilters "armeabi-v7a", "arm64-v8a", "x86"
+            abiFilters "arm64-v8a" //, "armeabi-v7a", "x86"
         }
         minSdkVersion 24
     }

RealCUGAN-NCNN-Android-CLI/app/src/main/jni/main.cpp

@@ -365,6 +365,9 @@ void* save(void* args)
         if (v.id == -233)
             break;
 
+        fprintf(stderr, "save result...\n");
+        float begin = clock();
+
         // free input pixel data
         {
             unsigned char* pixeldata = (unsigned char*)v.inimage.data;
@@ -408,6 +411,9 @@ void* save(void* args)
         }
         if (success)
         {
+            float end = clock();
+            fprintf(stderr, "save result use time: %.3f\n", (end - begin) / CLOCKS_PER_SEC);
+
             if (verbose)
             {
 #if _WIN32
@@ -420,9 +426,9 @@ void* save(void* args)
         else
         {
 #if _WIN32
-            fwprintf(stderr, L"encode image %ls failed\n", v.outpath.c_str());
+            fwprintf(stderr, L"save result failed: %ls\n", v.outpath.c_str());
 #else
-            fprintf(stderr, "encode image %s failed\n", v.outpath.c_str());
+            fprintf(stderr, "save result failed: %s\n", v.outpath.c_str());
 #endif
         }
     }

RealSR-NCNN-Android-CLI/app/src/main/jni/main.cpp

@@ -369,6 +369,8 @@ void* save(void* args)
         if (v.id == -233)
             break;
 
+        fprintf(stderr, "save result...\n");
+        float begin = clock();
         // free input pixel data
         {
             unsigned char* pixeldata = (unsigned char*)v.inimage.data;
@@ -386,8 +388,6 @@ void* save(void* args)
             }
         }
 
-        float begin = clock();
-
         int success = 0;
 
         path_t ext = get_file_extension(v.outpath);
@@ -412,25 +412,26 @@ void* save(void* args)
             success = stbi_write_jpg(v.outpath.c_str(), v.outimage.w, v.outimage.h, v.outimage.elempack, v.outimage.data, 100);
 #endif
         }
-        if (success) {
+        if (success)
+        {
             float end = clock();
-            fprintf(stderr, "save use time: %.2f\n",
-                    (end - begin) / CLOCKS_PER_SEC);
+            fprintf(stderr, "save result use time: %.3f\n", (end - begin) / CLOCKS_PER_SEC);
 
-            if (verbose) {
+            if (verbose)
+            {
 #if _WIN32
-                fwprintf(stderr, L"%ls -> %ls done\n", v.inpath.c_str(), v.outpath.c_str());
+                fwprintf(stdout, L"%ls -> %ls done\n", v.inpath.c_str(), v.outpath.c_str());
 #else
-                fprintf(stderr, "%s -> %s done\n", v.inpath.c_str(), v.outpath.c_str());
+                fprintf(stdout, "%s -> %s done\n", v.inpath.c_str(), v.outpath.c_str());
 #endif
             }
         }
         else
         {
 #if _WIN32
-            fwprintf(stderr, L"encode image %ls failed\n", v.outpath.c_str());
+            fwprintf(stderr, L"save result failed: %ls\n", v.outpath.c_str());
 #else
-            fprintf(stderr, "encode image %s failed\n", v.outpath.c_str());
+            fprintf(stderr, "save result failed: %s\n", v.outpath.c_str());
 #endif
         }
     }

RealSR-NCNN-Android-GUI/app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.tumuyan.ncnn.realsr"
         minSdk 24
         targetSdk 28
-        versionCode 14
-        versionName "1.7.1"
+        versionCode 15
+        versionName "1.7.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }