adjust command

Author: tumuyan

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

@@ -541,7 +541,7 @@ int main(int argc, char* argv[])
     );
 
     std::cout
-        << "------------------------\n"
+//        << "------------------------\n"
         << "Welcome to Anime4KCPP\n"
         << "------------------------\n";
 

RealSR-NCNN-Android-GUI/app/src/main/java/com/tumuyan/ncnn/realsr/MainActivity.java

@@ -121,10 +121,6 @@ public class MainActivity extends AppCompatActivity {
             "./realcugan-ncnn -i input.png -o output.png  -m models-pro -s 3  -n -1",
             "./realcugan-ncnn -i input.png -o output.png  -m models-pro -s 3  -n 0",
             "./realcugan-ncnn -i input.png -o output.png  -m models-pro -s 3  -n 3",
-            "./resize-ncnn -i input.png -o output.png  -m nearest  -n -s 2",
-            "./resize-ncnn -i input.png -o output.png  -m nearest  -n -s 4",
-            "./resize-ncnn -i input.png -o output.png  -m bilinear -n -s 2",
-            "./resize-ncnn -i input.png -o output.png  -m bilinear -n -s 4",
             "./Anime4k -i input.png -o output.png -z 2 ",
             "./Anime4k -i input.png -o output.png -z 2 -a -e 48",
             "./Anime4k -i input.png -o output.png -z 2 -b -r 48",
@@ -175,6 +171,8 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
             return false;
         } else if (v == R.id.menu_avir2) {
             q = "./resize-ncnn -i input.png -o output.png  -m avir -s 0.5";
+        } else if (v == R.id.menu_nearest4) {
+            q = "./resize-ncnn -i input.png -o output.png  -m nearest -s 4";
         } else if (v == R.id.menu_de_nearest) {
             q = "./resize-ncnn -i input.png -o output.png  -m de-nearest";
         } else if (v == R.id.menu_magick2) {
@@ -454,9 +452,9 @@ private List<String> getExtraCommands(String extraPath, String extraCommand) {
         List<String> cmdLabel = new ArrayList<>();
 
         // 增加resize-ncnn经典插值放大的命令
-        String[] classicalFilters = {"bicubic", "avir", "avir-lancir",};
+        String[] classicalFilters = {"nearest", "bilinear", "bicubic", "avir", "avir-lancir",};
 
-        String[] classicalResize = {"2", "4"};
+        String[] classicalResize = {"2", "4", "10"};
 
         for (String f : classicalFilters) {
             for (String s : classicalResize) {

RealSR-NCNN-Android-GUI/app/src/main/res/menu/main_menu.xml

@@ -32,6 +32,10 @@
         android:id="@+id/menu_de_nearest"
         android:title="@string/menu_de_nearest"
         app:showAsAction="never" />
+    <item
+        android:id="@+id/menu_nearest4"
+        android:title="@string/menu_nearest4"
+        app:showAsAction="never" />
     <item
         android:id="@+id/menu_bench_mark"
         android:title="@string/menu_bench_mark"

RealSR-NCNN-Android-GUI/app/src/main/res/values-zh/strings.xml

@@ -92,6 +92,7 @@
     <string name="menu_help">帮助</string>
     <string name="menu_out">显示处理后的图片</string>
     <string name="menu_in">显示处理前的图片</string>
+    <string name="menu_nearest4">Nearest放大4倍</string>
     <string name="menu_de_nearest">DeNearest缩小</string>
     <string name="menu_magick4">Magick缩小到1/4</string>
     <string name="menu_magick3">Magick缩小到1/3</string>
@@ -138,18 +139,6 @@
             <item>real-cugan-x4-conservative</item>
             <item>real-cugan-x4-noise0</item>
             <item>real-cugan-x4-noise3</item>
-            <item>classical-nearest-x2</item>
-            <item>classical-nearest-x4</item>
-            <item>classical-bilinear-x2</item>
-            <item>classical-bilinear-x4</item>
-            <item>classical-bicubic-x2</item>
-            <item>classical-bicubic-x4</item>
-            <item>classical-avir-x0.5</item>
-            <item>classical-avir-x2</item>
-            <item>classical-avir-x4</item>
-            <item>classical-avir-lancir-x2</item>
-            <item>classical-avir-lancir-x4</item>
-
             <item>Anime4k-x2</item>
             <item>Anime4k-x2-预处理-高斯模糊+双边滤镜</item>
             <item>Anime4k-x2-后处理-高斯模糊+双边滤镜</item>

RealSR-NCNN-Android-GUI/app/src/main/res/values/strings.xml

@@ -78,6 +78,7 @@ https://upscale.wiki/wiki/Model_Database There are many models here, download th
     <string name="path_not_exist">Not exist this directory</string>
     <string name="path_not_dir">The path is a file, not a directory</string>
     <string name="menu_out2in" translatable="false"><![CDATA[Output -> Input]]></string>
+    <string name="menu_nearest4">Nearest 400%</string>
     <string name="menu_de_nearest">De Nearest</string>
     <string name="menu_magick4">Magick 25%</string>
     <string name="menu_magick3">Magick 33.3%</string>
@@ -161,10 +162,6 @@ https://upscale.wiki/wiki/Model_Database There are many models here, download th
         <item>real-cugan-pro-x3-conservative</item>
         <item>real-cugan-pro-x3-noise0</item>
         <item>real-cugan-pro-x3-noise3</item>
-        <item>classical-nearest-x2</item>
-        <item>classical-nearest-x4</item>
-        <item>classical-bilinear-x2</item>
-        <item>classical-bilinear-x4</item>
         <item>Anime4k-x2</item>
         <item>Anime4k-x2-pre-gaussian_blur-bilateral</item>
         <item>Anime4k-x2-post-gaussian_blur-bilateral</item>