Merge pull request #52 from TNTwise/master

rife-v4.25

README.md

@@ -88,12 +88,13 @@ By default models are exported with ensemble=False and Fast=True
   - 65 = rife-v4.22-lite(ensemble=False)
   - 66 = rife-v4.24 (ensemble=False)
   - 67 = rife-v4.24 (ensemble=True)
+  - 68 = rife-v4.25 (ensemble=False)
 
   ## My experimental custom models (only works with 2x)
 
-  - 68 = sudo_rife4 (ensemble=False / fast=True)
-  - 69 = sudo_rife4 (ensemble=True / fast=False)
-  - 70 = sudo_rife4 (ensemble=True / fast=True)
+  - 69 = sudo_rife4 (ensemble=False / fast=True)
+  - 70 = sudo_rife4 (ensemble=True / fast=False)
+  - 71 = sudo_rife4 (ensemble=True / fast=True)
 
 - factor_num, factor_den: Factor of target frame rate. For example `factor_num=5, factor_den=2` will multiply input clip FPS by 2.5. Only rife-v4 model supports custom frame rate.
 

RIFE/plugin.cpp

@@ -203,8 +203,8 @@ static void VS_CC rifeCreate(const VSMap* in, VSMap* out, [[maybe_unused]] void*
         if (err)
             d->skipThreshold = 60.0;
 
-        if (model < 0 || model > 70)
-            throw "model must be between 0 and 70 (inclusive)";
+        if (model < 0 || model > 71)
+            throw "model must be between 0 and 71 (inclusive)";
 
         if (factorNum < 1)
             throw "factor_num must be at least 1";
@@ -490,12 +490,15 @@ static void VS_CC rifeCreate(const VSMap* in, VSMap* out, [[maybe_unused]] void*
                 modelPath += "/rife-v4.24_ensembleTrue";
                 break;
             case 68:
-                modelPath += "/sudo_rife4_ensembleFalse_fastTrue";
+                modelPath += "/rife-v4.25_ensembleFalse";
                 break;
             case 69:
-                modelPath += "/sudo_rife4_ensembleTrue_fastFalse";
+                modelPath += "/sudo_rife4_ensembleFalse_fastTrue";
                 break;
             case 70:
+                modelPath += "/sudo_rife4_ensembleTrue_fastFalse";
+                break;
+            case 71:
                 modelPath += "/sudo_rife4_ensembleTrue_fastTrue";
                 break;