Skip to content

Commit 5494934

Browse files
tumuyantumuyan
committed
remove srmd model, add Nomos8kSC, change model repo
1 parent b85ae62 commit 5494934

File tree

5 files changed

+72
-92
lines changed

5 files changed

+72
-92
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
3rdparty/OpenCV-android-sdk/*
88
/*/*/build
99
/*/*/.cxx
10+
/RealSR-NCNN-Android-GUI/app/debug

‎README.md‎

Lines changed: 28 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ input & output
2626
![](Screenshot.jpg)
2727

2828
### Add more models to RealSR-NCNN-Android-GUI
29-
RealSR-NCNN-Android-GUI could load extra models from sdcard automatily in ver 1.7.6. You could download more models from https://github.com/tumuyan/realsr-models .
29+
RealSR-NCNN-Android-GUI could load extra models from sdcard automatily in ver 1.7.6. You could download more models from https://huggingface.co/tumuyan2/realsr-models .
3030
1. Make a directory in sdcard.
3131
2. Input the directory path to `Path for custom models (RealSR/ESRGAN/Waifu2x)` and save.
3232
3. Download and copy models to the directory you make.
@@ -157,7 +157,6 @@ If you encounter crash or error, try to upgrade your derive
157157
Download `assets.zip` from github release page, the zip file contains models & elf files. Unzip and put them to this folder, then build it with Android Studio.
158158
The direct download link for current version: https://github.com/tumuyan/RealSR-NCNN-Android/releases/download/1.9.1/assets.zip
159159

160-
161160
```
162161
RealSR-NCNN-Android-GUI\app\src\main\assets\
163162
└─realsr
@@ -214,44 +213,33 @@ RealSR-NCNN-Android-GUI\app\src\main\assets\
214213
│ x4.bin
215214
│ x4.param
216215
│
217-
├─models-se
218-
│ up2x-conservative.bin
219-
│ up2x-conservative.param
220-
│ up2x-denoise1x.bin
221-
│ up2x-denoise1x.param
222-
│ up2x-denoise2x.bin
223-
│ up2x-denoise2x.param
224-
│ up2x-denoise3x.bin
225-
│ up2x-denoise3x.param
226-
│ up2x-no-denoise.bin
227-
│ up2x-no-denoise.param
228-
│ up3x-conservative.bin
229-
│ up3x-conservative.param
230-
│ up3x-denoise3x.bin
231-
│ up3x-denoise3x.param
232-
│ up3x-no-denoise.bin
233-
│ up3x-no-denoise.param
234-
│ up4x-conservative.bin
235-
│ up4x-conservative.param
236-
│ up4x-denoise3x.bin
237-
│ up4x-denoise3x.param
238-
│ up4x-no-denoise.bin
239-
│ up4x-no-denoise.param
240-
│
241-
└─models-srmd
242-
srmdnf_x2.bin
243-
srmdnf_x2.param
244-
srmdnf_x3.bin
245-
srmdnf_x3.param
246-
srmdnf_x4.bin
247-
srmdnf_x4.param
248-
srmd_x2.bin
249-
srmd_x2.param
250-
srmd_x3.bin
251-
srmd_x3.param
252-
srmd_x4.bin
253-
srmd_x4.param
254-
216+
├─models-ESRGAN-Nomos8kSC
217+
│ x4.bin
218+
│ x4.param
219+
|
220+
└─models-se
221+
up2x-conservative.bin
222+
up2x-conservative.param
223+
up2x-denoise1x.bin
224+
up2x-denoise1x.param
225+
up2x-denoise2x.bin
226+
up2x-denoise2x.param
227+
up2x-denoise3x.bin
228+
up2x-denoise3x.param
229+
up2x-no-denoise.bin
230+
up2x-no-denoise.param
231+
up3x-conservative.bin
232+
up3x-conservative.param
233+
up3x-denoise3x.bin
234+
up3x-denoise3x.param
235+
up3x-no-denoise.bin
236+
up3x-no-denoise.param
237+
up4x-conservative.bin
238+
up4x-conservative.param
239+
up4x-denoise3x.bin
240+
up4x-denoise3x.param
241+
up4x-no-denoise.bin
242+
up4x-no-denoise.param
255243
```
256244

257245
## Acknowledgement

‎README_CHS.md‎

Lines changed: 30 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@
4646

4747
## 为 RealSR-NCNN-Android-GUI 增加更多模型
4848
RealSR-NCNN-Android-GUI 在 ver 1.7.6 以上的版本可以自动加载自定义模型。
49-
你可以从 https://github.com/tumuyan/realsr-models 下载更多模型：
49+
你可以从 https://huggingface.co/tumuyan2/realsr-models 下载更多模型：
5050
1. 在文件管理器里新建一个目录
5151
2. 在App的设置中，自定义模型路径的选项里填入刚才新建目录的路径，点击保存
5252
3. 下载模型并复制到刚才新建的目录里
5353
5. 返回App，可以看到下拉菜单增加了新的模型
5454

55-
![](Screenshot_models.jpg)
55+
![目录结构](Screenshot_models.jpg)
5656

5757
你自己也可以把pth格式的模型转换为本应用可用的ncnn模型。
5858
1. 从 [https://upscale.wiki/wiki/Model_Database](https://upscale.wiki/wiki/Model_Database) 下载模型并解压
@@ -178,7 +178,7 @@ RealSR-NCNN-Android-GUI\app\src\main\assets\
178178
│ resize-ncnn
179179
│ srmd-ncnn
180180
│ waifu2x-ncnn
181-
|
181+
│
182182
├─models-nose
183183
│ up2x-no-denoise.bin
184184
│ up2x-no-denoise.param
@@ -219,47 +219,35 @@ RealSR-NCNN-Android-GUI\app\src\main\assets\
219219
│ x4.bin
220220
│ x4.param
221221
│
222-
├─models-se
223-
│ up2x-conservative.bin
224-
│ up2x-conservative.param
225-
│ up2x-denoise1x.bin
226-
│ up2x-denoise1x.param
227-
│ up2x-denoise2x.bin
228-
│ up2x-denoise2x.param
229-
│ up2x-denoise3x.bin
230-
│ up2x-denoise3x.param
231-
│ up2x-no-denoise.bin
232-
│ up2x-no-denoise.param
233-
│ up3x-conservative.bin
234-
│ up3x-conservative.param
235-
│ up3x-denoise3x.bin
236-
│ up3x-denoise3x.param
237-
│ up3x-no-denoise.bin
238-
│ up3x-no-denoise.param
239-
│ up4x-conservative.bin
240-
│ up4x-conservative.param
241-
│ up4x-denoise3x.bin
242-
│ up4x-denoise3x.param
243-
│ up4x-no-denoise.bin
244-
│ up4x-no-denoise.param
245-
│
246-
└─models-srmd
247-
srmdnf_x2.bin
248-
srmdnf_x2.param
249-
srmdnf_x3.bin
250-
srmdnf_x3.param
251-
srmdnf_x4.bin
252-
srmdnf_x4.param
253-
srmd_x2.bin
254-
srmd_x2.param
255-
srmd_x3.bin
256-
srmd_x3.param
257-
srmd_x4.bin
258-
srmd_x4.param
259-
222+
├─models-ESRGAN-Nomos8kSC
223+
│ x4.bin
224+
│ x4.param
225+
|
226+
└─models-se
227+
up2x-conservative.bin
228+
up2x-conservative.param
229+
up2x-denoise1x.bin
230+
up2x-denoise1x.param
231+
up2x-denoise2x.bin
232+
up2x-denoise2x.param
233+
up2x-denoise3x.bin
234+
up2x-denoise3x.param
235+
up2x-no-denoise.bin
236+
up2x-no-denoise.param
237+
up3x-conservative.bin
238+
up3x-conservative.param
239+
up3x-denoise3x.bin
240+
up3x-denoise3x.param
241+
up3x-no-denoise.bin
242+
up3x-no-denoise.param
243+
up4x-conservative.bin
244+
up4x-conservative.param
245+
up4x-denoise3x.bin
246+
up4x-denoise3x.param
247+
up4x-no-denoise.bin
248+
up4x-no-denoise.param
260249
```
261250

262-
263251
## 感谢
264252
### 原始超分辨率项目
265253
- https://github.com/xinntao/Real-ESRGAN

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

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,9 @@ public class MainActivity extends AppCompatActivity {
101101
"./realsr-ncnn -i input.png -o output.png -m models-Real-ESRGANv3-anime -s 3",
102102
"./realsr-ncnn -i input.png -o output.png -m models-Real-ESRGANv3-anime -s 4",
103103
"./realsr-ncnn -i input.png -o output.png -m models-Real-ESRGANv2-anime -s 2",
104-
"./realsr-ncnn -i input.png -o output.png -m models-Real-ESRGANv2-anime",
104+
"./realsr-ncnn -i input.png -o output.png -m models-Real-ESRGANv2-anime -s 4",
105+
"./realsr-ncnn -i input.png -o output.png -m models-ESRGAN-Nomos8kSC -s 4",
105106
"./realsr-ncnn -i input.png -o output.png -m models-Real-ESRGAN-SourceBook -s 2",
106-
"./srmd-ncnn -i input.png -o output.png -m models-srmd -s 4",
107-
"./srmd-ncnn -i input.png -o output.png -m models-srmd -s 3",
108-
"./srmd-ncnn -i input.png -o output.png -m models-srmd -s 2",
109107
"./realcugan-ncnn -i input.png -o output.png -m models-nose -s 2 -n 0",
110108
"./realcugan-ncnn -i input.png -o output.png -m models-se -s 2 -n -1",
111109
"./realcugan-ncnn -i input.png -o output.png -m models-se -s 2 -n 0",
@@ -497,20 +495,27 @@ private List<String> getExtraCommands(String extraPath, String extraCommand) {
497495
for (File folder : folders) {
498496
String name = folder.getName();
499497
if (folder.isDirectory() && name.startsWith("models")) {
500-
501-
// 匹配realsr模型
498+
// 默认匹配realsr/real-esrgan模型目录
502499
String model = name.replace("models-", "");
503500
String scaleMatcher = ".*x(\\d+).*";
504501
String noiseMatcher = "";
505502
String command = "./realsr-ncnn -i input.png -o output.png -m " + folder.getAbsolutePath() + " -s ";
506503

507-
// 匹配waifu2x模型
508504
if (name.matches("models-(cugan|cunet|upconv).*")) {
505+
// 匹配waifu2x模型目录
509506
model = name.replace("models-", "Waifu2x-");
510507
scaleMatcher = ".*scale(\\d+).*";
511508
command = "./waifu2x-ncnn -i input.png -o output.png -m " + folder.getAbsolutePath() + " -s ";
512509
noiseMatcher = "noise(\\d+).*";
510+
} else if (name.matches("models-srmd.*")) {
511+
// 匹配srmd模型目录
512+
if (name.equals("models-srmd"))
513+
model = "SRMD";
514+
else
515+
model = name.replace("models-srmd", "SRMD-");
516+
command = "./srmd-ncnn -i input.png -o output.png -m " + folder.getAbsolutePath() + " -s ";
513517
} else if (name.startsWith("models-DF2K")) {
518+
// 匹配realsr模型目录
514519
model = name.replace("models-", "RealSR-");
515520
}
516521

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,8 @@ https://upscale.wiki/wiki/Model_Database There are many models here, download th
143143
<item>real-esrganv3-anime-x4</item>
144144
<item>real-esrganv2-anime-x2</item>
145145
<item>real-esrganv2-anime-x4 (fast but oversharpening)</item>
146+
<item>real-esrgan-Nomos8kSC-x4</item>
146147
<item>real-esrgan-SourceBook-x2</item>
147-
<item>srmd-x4</item>
148-
<item>srmd-x3</item>
149-
<item>srmd-x2</item>
150148
<item>real-cugan-x2-no-denoise</item>
151149
<item>real-cugan-x2-conservative</item>
152150
<item>real-cugan-x2-noise0</item>

0 commit comments

Comments
 (0)