Set rff=True when using BestSource (#33)

* Set `rff=True` when using BestSource Co-authored-by: sgt0 <[email protected]> * Run build on PRs --------- Co-authored-by: Setsugennoao <[email protected]>
Jaded-Encoding-Thaumaturgy · Sep 18, 2024 · a9272a2 · a9272a2
1 parent f424fda
commit a9272a2
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 12 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -10,8 +10,9 @@ on:
       - 'Makefile.am'
       - 'qt.conf'
       - '.github/workflows/windows.yml'
+  pull_request:
   workflow_dispatch:
-    
+
 
 jobs:
   build-windows:
@@ -23,7 +24,7 @@ jobs:
 
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 1
 
@@ -57,7 +58,7 @@ jobs:
         cp -r $MSYSTEM_PREFIX/share/qt5/plugins/{platforms,styles} deploy
 
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Wobbly-win64
         path: deploy
diff --git a/src/shared/WobblyProject.cpp b/src/shared/WobblyProject.cpp
@@ -4128,8 +4128,20 @@ void WobblyProject::presetsToScript(std::string &script) const {
 }
 
 
+const char *WobblyProject::getArgsForSourceFilter() const {
+    if (source_filter == "bs.VideoSource")
+        return ", rff=True";
+    return "";
+}
+
+
 void WobblyProject::sourceToScript(std::string &script, bool save_node) const {
-    std::string src = "src = c." + source_filter + "(r'" + handleSingleQuotes(input_file) + "')\n";
+    std::string src = std::format(
+        "src = c.{}(r'{}'{})\n",
+        source_filter,
+        handleSingleQuotes(input_file),
+        getArgsForSourceFilter()
+    );
 
     if (save_node) {
     script +=

diff --git a/src/shared/WobblyProject.h b/src/shared/WobblyProject.h
@@ -438,6 +438,7 @@ class WobblyProject : public QObject {
         void customListsToScript(std::string &script, PositionInFilterChain position) const;
         void headerToScript(std::string &script) const;
         void presetsToScript(std::string &script) const;
+        const char *getArgsForSourceFilter() const;
         void sourceToScript(std::string &script, bool save_node) const;
         void trimToScript(std::string &script) const;
         void fieldHintToScript(std::string &script) const;

diff --git a/src/wibbly/WibblyJob.cpp b/src/wibbly/WibblyJob.cpp
@@ -235,24 +235,34 @@ void WibblyJob::headerToScript(std::string &script) const {
             "\n";
 }
 
+const char *WibblyJob::getArgsForSourceFilter() const {
+    if (source_filter == "bs.VideoSource")
+        return ", rff=True";
+    return "";
+}
+
 
 void WibblyJob::sourceToScript(std::string &script) const {
     std::string fixed_input_file = handleSingleQuotes(input_file);
 
-    script +=
-            "if wibbly_last_input_file == r'" + fixed_input_file + "':\n"
+    script += std::format(
+            "if wibbly_last_input_file == r'{0}':\n"
             "    try:\n"
             "        src = vs.get_output(index=1)\n"
             "        if isinstance(src, vs.VideoOutputTuple):\n"
             "            src = src[0]\n"
             "    except KeyError:\n"
-            "        src = c." + source_filter + "(r'" + fixed_input_file + "')\n"
+            "        src = c.{1}(r'{0}'{2})\n"
             "        src.set_output(index=1)\n"
             "else:\n"
-            "    src = c." + source_filter + "(r'" + fixed_input_file + "')\n"
+            "    src = c.{1}(r'{0}'{2})\n"
             "    src.set_output(index=1)\n"
-            "    wibbly_last_input_file = r'" + fixed_input_file + "'\n"
-            "\n";
+            "    wibbly_last_input_file = r'{0}'\n"
+            "\n",
+            fixed_input_file,
+            source_filter,
+            getArgsForSourceFilter()
+    );
 }
 
 

diff --git a/src/wibbly/WibblyJob.h b/src/wibbly/WibblyJob.h
@@ -67,6 +67,7 @@ class WibblyJob {
 
     double fades_threshold;
 
+    const char *getArgsForSourceFilter() const;
 
     void headerToScript(std::string &script) const;
     void sourceToScript(std::string &script) const;

diff --git a/src/wobbly/WobblyWindow.cpp b/src/wobbly/WobblyWindow.cpp
@@ -3878,6 +3878,11 @@ void WobblyWindow::openProject() {
     }
 }
 
+const char *WobblyWindow::getArgsForSourceFilter(const QString &source_filter) {
+    if (source_filter == "bs.VideoSource")
+        return ", rff=True";
+    return "";
+}
 
 void WobblyWindow::realOpenVideo(const QString &path) {
     try {
@@ -3897,8 +3902,11 @@ void WobblyWindow::realOpenVideo(const QString &path) {
                     "\n"
                     "c = vs.core\n"
                     "\n"
-                    "c.%1(r'%2').set_output()\n");
-        script = script.arg(source_filter).arg(QString::fromStdString(handleSingleQuotes(path.toStdString())));
+                    "c.%1(r'%2'%3).set_output()\n");
+        script = script
+            .arg(source_filter)
+            .arg(QString::fromStdString(handleSingleQuotes(path.toStdString())))
+            .arg(getArgsForSourceFilter(source_filter));
 
         QApplication::setOverrideCursor(Qt::WaitCursor);
 

diff --git a/src/wobbly/WobblyWindow.h b/src/wobbly/WobblyWindow.h
@@ -320,6 +320,8 @@ class WobblyWindow : public QMainWindow {
     void keyPressEvent(QKeyEvent *event);
     void wheelEvent(QWheelEvent *event);
 
+    const char *getArgsForSourceFilter(const QString &source_filter);
+
     void realOpenProject(const QString &path);
     void realOpenVideo(const QString &path);
     void realSaveProject(const QString &path);