feat:eyebrow usage toggle

yuyuyzl · Jan 11, 2025 · 6aae60a · 6aae60a
1 parent cea27fb
commit 6aae60a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -14,10 +14,10 @@ Fork自 https://github.com/GunwooHan/EasyVtuber
 Updates:  
 * 使用 https://github.com/zpeng11/ezvtuber-rt/tree/main 项目转换的ONNX模型，实现TensorRT加速以及非N卡支持，在半精度和全精度下均有加速（具体取决于显卡）  
 * 为A卡和I卡提供DirectML支持，人人都能玩。  
-* 引入RIFE模型进行插帧，极限帧数提升达到50%-100%，配合锁帧可以有效降低使用占用。  
-* 使用TurboJPEG 获得成倍缓存命中率提升，在长时间使用上显卡减负效果相当出色。  
+* 引入[RIFE](https://github.com/hzwer/ECCV2022-RIFE)模型进行插帧，极限帧数提升达到50%-100%，配合锁帧可以有效降低使用占用。  
+* 使用 [TurboJPEG](https://github.com/Dobatymo/turbojpeg-python) 获得成倍缓存命中率提升，在长时间使用上显卡减负效果相当出色。  
 * 使用 [waifu2x](https://github.com/nagadomi/waifu2x) 和 [real-esrgan]() 项目带来的输出超分辨率，对比anime4k效果提升显著（也使用更多gpu占用）  
-* 更漂亮的新启动器界面，带中文介绍更加简单易用  
+* 更漂亮的 WxPython 新启动器界面，带中文介绍更加简单易用  
 
 ## Requirements  
 

diff --git a/ezvtb_rt_interface.py b/ezvtb_rt_interface.py
@@ -34,6 +34,7 @@ def get_core(
         model_cache:bool = True,#Only works for tensorrt
         model_vram_cache:bool = True, #Only works for tensorrt
         model_cache_size:float = 1.0, #unit of GigaBytes, only works for tensorrt
+        model_use_eyebrow:bool = True,
         #RIFE interpolation setting
         use_interpolation:bool = True,
         interpolation_scale:int = 2,
@@ -106,10 +107,10 @@ def get_core(
         else:
             if model_vram_cache:
                 from ezvtb_rt.tha import THACoreCachedVRAM
-                tha = THACoreCachedVRAM(tha_model_dir, model_cache_size)
+                tha = THACoreCachedVRAM(tha_model_dir, model_cache_size, model_use_eyebrow)
             else:
                 from ezvtb_rt.tha import THACoreCachedRAM
-                tha = THACoreCachedRAM(tha_model_dir, model_cache_size)
+                tha = THACoreCachedRAM(tha_model_dir, model_cache_size, model_use_eyebrow)
         rife = None
         if use_interpolation:
             from ezvtb_rt.rife import RIFECoreLinked
@@ -122,7 +123,7 @@ def get_core(
         core = Core(tha, cacher, sr, rife)
     else: #Use directml
         from ezvtb_rt.core_ort import CoreORT
-        core = CoreORT(tha_model_dir, rife_path = rife_model_path if len(rife_model_path) > 0 else None, sr_path = sr_model_path if len(sr_model_path) > 0 else None, cacher=cacher, device_id=device_id)
+        core = CoreORT(tha_model_dir, rife_path = rife_model_path if len(rife_model_path) > 0 else None, sr_path = sr_model_path if len(sr_model_path) > 0 else None, cacher=cacher, device_id=device_id, use_eyebrow = model_use_eyebrow)
 
     return core
 

diff --git a/ezvtuber-rt b/ezvtuber-rt
diff --git a/launcher2.py b/launcher2.py
@@ -9,7 +9,7 @@
 ctypes.windll.shcore.SetProcessDpiAwareness(1)
 p = None
 cache_simplify_map = {
-    'Off':0,
+    'OFF':0,
     'Low':1,
     'Medium':2,
     'High':3,
@@ -20,7 +20,7 @@
 
 
 cache_simplify_quality_map = {
-    'Off':100,
+    'OFF':100,
     'Low':99,
     'Medium':95,
     'High':90,

diff --git a/main.py b/main.py
@@ -352,6 +352,7 @@ def run(self):
                               model_cache=args.model_cache, 
                               model_vram_cache=args.model_vram_cache,
                               model_cache_size=args.max_gpu_cache_len, 
+                              model_use_eyebrow=args.eyebrow,
 
                               use_interpolation=args.use_interpolation,
                               interpolation_scale=args.interpolation_scale,
+3 −3		ezvtb_rt/core_ort.py
+44 −20		ezvtb_rt/tha.py
+88 −33		ezvtb_rt/tha_ort.py