Merge pull request #814 from ElderOrb/#812

use ignore and merge options for frame filtering #812
mipops · Jan 31, 2024 · c0bba3c · c0bba3c
2 parents ae0afe0 + 067945f
commit c0bba3c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/Source/GUI/dvrescue/dvrescue/CapturePage.qml b/Source/GUI/dvrescue/dvrescue/CapturePage.qml
@@ -265,6 +265,7 @@ Rectangle {
                         ['--decklink-audio-source', decklinkConfigPopup.audioSourcesModel[currentAudioSourceIndex]],
                         ['--decklink-timecode-format', decklinkConfigPopup.timecodesModel[currentTimecodesIndex]],
                     )
+
                     return opts;
                 }
 
@@ -294,6 +295,19 @@ Rectangle {
                         }
 
                         statusText = "sending record";
+
+                        if(settings.keepFramesAtNonStandardPlaybackSpeed) {
+                            opts.push('--merge-output-speed');
+                        } else {
+                            opts.push('--merge-ignore-speed');
+                        }
+
+                        if(settings.keepFramesThatAllFullyConcealed) {
+                            opts.push('--merge-output-concealed');
+                        } else {
+                            opts.push('--merge-ignore-concealed');
+                        }
+
                         dvrescue.grab(id, filePath, playbackBuffer, csvParser, opts, (launcher) => {
                            outputFilePath = filePath
                            csvParser.columnsChanged.connect(onColumnsChanged);

diff --git a/Source/GUI/dvrescue/dvrescue/DvRescueCLI.qml b/Source/GUI/dvrescue/dvrescue/DvRescueCLI.qml
@@ -235,7 +235,7 @@ Item {
                     callback(launcher)
             });
 
-            var arguments = ['-y', 'device://' + id].concat(opts).concat(['-capture', '-cmd', captureCmd, '-m', '-', '--verbosity', '9', '--csv'])
+            var arguments = ['-y', 'device://' + id].concat(opts).concat(['-capture', '-cmd', captureCmd, '--merge-output-speed', '--merge-output-concealed', '-m', '-', '--verbosity', '9', '--csv'])
 
             if(settings.endTheCaptureIftheTapeContainsNoDataFor && settings.endTheCaptureIftheTapeContainsNoDataFor !== '') {
                 arguments.push('--timeout')
@@ -285,7 +285,7 @@ Item {
             var xml = file + ".dvrescue.xml"
             var scc = file + ".scc"
 
-            var arguments = ['-y', 'device://' + id].concat(opts).concat(['-x', xml, '-c', scc, '--cc-format', 'scc', '-m', file, '-m', '-', '--verbosity', '9', '--csv'])
+            var arguments = ['-y', 'device://' + id].concat(opts).concat(['-x', xml, '-c', scc, '--cc-format', 'scc', '-m', file, '--merge-output-speed', '--merge-output-concealed', '-m', '-', '--verbosity', '9', '--csv'])
 
             if(settings.endTheCaptureIftheTapeContainsNoDataFor && settings.endTheCaptureIftheTapeContainsNoDataFor !== '') {
                 arguments.push('--timeout')