一部のフィルタが動かなくなっていたのを修正

nekopanda · Apr 14, 2019 · 72535ad · 72535ad
1 parent 0334cd0
commit 72535ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/AmatsukazeServer/Properties/AssemblyInfo.cs b/AmatsukazeServer/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // 以下のように '*' を使用します:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.9.0.3")]
+[assembly: AssemblyFileVersion("0.9.0.4")]
diff --git a/AmatsukazeServer/Server/Misc.cs b/AmatsukazeServer/Server/Misc.cs
@@ -1275,7 +1275,7 @@ public static string FilterToString(FilterSetting filter, Setting setting)
                         preset = ", preset=\"" + preset + "\"";
                     }
                     sb.AppendLine("dsrc.KFMDeint(mode=1" + preset + ", ucf=false, nr=false" +
-                        ", cuda=" + (filter.EnableCUDA ? "true" : "false") + ", is120=" + filter.KfmVfr120fps + ")");
+                        ", cuda=" + (filter.EnableCUDA ? "true" : "false") + ")");
                 }
                 else if (filter.DeinterlaceAlgorithm == DeinterlaceAlgorithm.KFM)
                 {
@@ -1299,6 +1299,7 @@ public static string FilterToString(FilterSetting filter, Setting setting)
                         ", svp=" + ((filter.KfmFps == FilterFPS.SVP) ? "true" : "false") +
                         ", thswitch=" + ((filter.KfmFps == FilterFPS.VFR30) ? "-1" : "3") +
                         ", cuda=" + (filter.EnableCUDA ? "true" : "false") +
+                        ", is120=" + filter.KfmVfr120fps +
                         ", dev=AMT_DEV, filepath=AMT_TMP)");
                 }
                 else if(filter.DeinterlaceAlgorithm == DeinterlaceAlgorithm.Yadif)
@@ -1348,7 +1349,7 @@ public static string FilterToString(FilterSetting filter, Setting setting)
                     if (parallel <= 1)
                     {
                         sb.AppendLine("if(AMT_PASS == 0) { AMT_SOURCE." + fname + "(logp" + crop + ") }");
-                        sb.AppendLine("if(AMT_PASS == 1) { AMT_SOURCE.AMTExec(" + autovfrarg + ").Trim(0,-1) }");
+                        sb.AppendLine("if(AMT_PASS == 1) { AMT_SOURCE.AMTExec(\"" + autovfrarg + "\").Trim(0,-1) }");
                     }
                     else
                     {