Merge onto main, bump version

Author: AustinMroz

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-videohelpersuite"
 description = "Nodes related to video workflows"
-version = "1.4.1"
+version = "1.4.3"
 license = { file = "LICENSE" }
 dependencies = ["opencv-python", "imageio-ffmpeg"]
 

video_formats/h264-mp4.json

@@ -9,5 +9,6 @@
     ],
     "audio_pass": ["-c:a", "aac"],
     "save_metadata": ["save_metadata", "BOOLEAN", {"default": true}],
+    "trim_to_audio": ["trim_to_audio", "BOOLEAN", {"default": false}],
     "extension": "mp4"
 }

video_formats/webm.json

@@ -10,5 +10,6 @@
     ],
     "audio_pass": ["-c:a", "libvorbis"],
     "save_metadata": ["save_metadata", "BOOLEAN", {"default": true}],
+    "trim_to_audio": ["trim_to_audio", "BOOLEAN", {"default": false}],
     "extension": "webm"
 }

videohelpersuite/load_video_nodes.py

@@ -7,6 +7,7 @@
 import psutil
 import subprocess
 import re
+import time
 
 import folder_paths
 from comfy.utils import common_upscale, ProgressBar

videohelpersuite/nodes.py

@@ -336,8 +336,8 @@ def batched_encode(images, vae, frames_per_batch):
             output_process = None
 
         # save first frame as png to keep metadata
-        file = f"{filename}_{counter:05}.png"
-        file_path = os.path.join(full_output_folder, file)
+        first_image_file = f"{filename}_{counter:05}.png"
+        file_path = os.path.join(full_output_folder, first_image_file)
         Image.fromarray(tensor_to_bytes(first_image)).save(
             file_path,
             pnginfo=metadata,
@@ -529,12 +529,15 @@ def pad(image):
                 #Reconsider forcing apad/shortest
                 channels = audio['waveform'].size(1)
                 min_audio_dur = total_frames_output / frame_rate + 1
+                if video_format.get('trim_to_audio', 'False') != 'False':
+                    apad = []
+                else:
+                    apad = ["-af", "apad=whole_dur="+str(min_audio_dur)]
                 mux_args = [ffmpeg_path, "-v", "error", "-n", "-i", file_path,
                             "-ar", str(audio['sample_rate']), "-ac", str(channels),
                             "-f", "f32le", "-i", "-", "-c:v", "copy"] \
                             + video_format["audio_pass"] \
-                            + ["-af", "apad=whole_dur="+str(min_audio_dur),
-                               "-shortest", output_file_with_audio_path]
+                            + apad + ["-shortest", output_file_with_audio_path]
 
                 audio_data = audio['waveform'].squeeze(0).transpose(0,1) \
                         .numpy().tobytes()
@@ -552,19 +555,19 @@ def pad(image):
                 #It will be muted unless opened or saved with right click
                 file = output_file_with_audio
 
-        previews = [
-            {
+        preview = {
                 "filename": file,
                 "subfolder": subfolder,
                 "type": "output" if save_output else "temp",
                 "format": format,
                 "frame_rate": frame_rate,
+                "workflow": first_image_file,
+                "fullpath": output_files[-1],
             }
-        ]
         if num_frames == 1 and 'png' in format and '%03d' in file:
             previews[0]['format'] = 'image/png'
             previews[0]['filename'] = file.replace('%03d', '001')
-        return {"ui": {"gifs": previews}, "result": ((save_output, output_files),)}
+        return {"ui": {"gifs": [preview]}, "result": ((save_output, output_files),)}
     @classmethod
     def VALIDATE_INPUTS(self, format, **kwargs):
         return True

web/js/VHS.core.js

@@ -891,6 +891,7 @@ function addVideoPreview(nodeType) {
         previewWidget.parentEl.appendChild(previewWidget.imgEl)
     });
 }
+let copiedPath = undefined
 function addPreviewOptions(nodeType) {
     chainCallback(nodeType.prototype, "getExtraMenuOptions", function(_, options) {
         // The intended way of appending options is returning a list of extra options,
@@ -901,10 +902,12 @@ function addPreviewOptions(nodeType) {
 
         let url = null
         if (previewWidget.videoEl?.hidden == false && previewWidget.videoEl.src) {
-            //Use full quality video
-            url = api.apiURL('/view?' + new URLSearchParams(previewWidget.value.params));
-            //Workaround for 16bit png: Just do first frame
-            url = url.replace('%2503d', '001')
+            if (['input', 'output', 'temp'].includes(previewWidget.value.params.type)) {
+                //Use full quality video
+                url = api.apiURL('/view?' + new URLSearchParams(previewWidget.value.params));
+                //Workaround for 16bit png: Just do first frame
+                url = url.replace('%2503d', '001')
+            }
         } else if (previewWidget.imgEl?.hidden == false && previewWidget.imgEl.src) {
             url = previewWidget.imgEl.src;
             url = new URL(url);
@@ -922,13 +925,42 @@ function addPreviewOptions(nodeType) {
                     callback: () => {
                         const a = document.createElement("a");
                         a.href = url;
-                        a.setAttribute("download", new URLSearchParams(previewWidget.value.params).get("filename"));
+                        a.setAttribute("download", previewWidget.value.params.filename);
                         document.body.append(a);
                         a.click();
                         requestAnimationFrame(() => a.remove());
                     },
                 }
             );
+            if (previewWidget.value.params.fullpath) {
+                copiedPath = previewWidget.value.params.fullpath
+                const blob = new Blob([previewWidget.value.params.fullpath],
+                    { type: 'text/plain'})
+                optNew.push({
+                    content: "Copy output filepath",
+                    callback: async () => {
+                        await navigator.clipboard.write([
+                            new ClipboardItem({
+                                'text/plain': blob
+                            })])}
+                });
+            }
+            if (previewWidget.value.params.workflow) {
+                let wParams = {...previewWidget.value.params,
+                    filename: previewWidget.value.params.workflow}
+                let wUrl = api.apiURL('/view?' + new URLSearchParams(wParams));
+                optNew.push({
+                    content: "Save workflow image",
+                    callback: () => {
+                        const a = document.createElement("a");
+                        a.href = wUrl;
+                        a.setAttribute("download", previewWidget.value.params.workflow);
+                        document.body.append(a);
+                        a.click();
+                        requestAnimationFrame(() => a.remove());
+                    }
+                });
+            }
         }
         const PauseDesc = (previewWidget.value.paused ? "Resume" : "Pause") + " preview";
         if(previewWidget.videoEl.hidden == false) {
@@ -1043,7 +1075,7 @@ function addFormatWidgets(nodeType) {
                             w.options.values = w.type;
                             w.type = "combo";
                         }
-                        if(inputData[1]?.default) {
+                        if(inputData[1]?.default != undefined) {
                             w.value = inputData[1].default;
                         }
                         if (w.type == "INT") {
@@ -1633,6 +1665,55 @@ app.registerExtension({
             return res
         }
         app.graphToPrompt = graphToPrompt
+        //Add a handler for pasting video data
+        document.addEventListener('paste', async (e) => {
+            if (!e.target.classList.contains('litegraph') &&
+                !e.target.classList.contains('graph-canvas-container')) {
+                    return
+                }
+            let data = e.clipboardData || window.clipboardData
+            let filepath = data.getData('text/plain')
+            let video
+            for (const item of data.items) {
+                if (item.type.startsWith('video/')) {
+                    video = item
+                    break
+                }
+            }
+            if (filepath && copiedPath == filepath) {
+                //Add a Load Video (Path) and populate filepath
+                const pastedNode = LiteGraph.createNode('VHS_LoadVideoPath')
+                app.graph.add(pastedNode)
+                pastedNode.pos[0] = app.canvas.graph_mouse[0]
+                pastedNode.pos[1] = app.canvas.graph_mouse[1]
+                pastedNode.widgets[0].value = filepath
+                pastedNode.widgets[0].callback?.(filepath)
+            } else if (video && false) {
+                //Disabled due to lack of testing
+                //Add a Load Video (Upload), then upload the file, then select the file
+                const pastedNode = LiteGraph.createNode('VHS_LoadVideo')
+                app.graph.add(pastedNode)
+                pastedNode.pos[0] = app.canvas.graph_mouse[0]
+                pastedNode.pos[1] = app.canvas.graph_mouse[1]
+                const pathWidget = pastedNode.widgets[0]
+                //TODO: upload to pasted dir?
+                const blob = video.getAsFile()
+                const resp = await uploadFile(blob)
+                if (resp.status != 200) {
+                    //upload failed and file can not be added to options
+                    return;
+                }
+                const filename = (await resp.json()).name;
+                pathWidget.options.values.push(filename);
+                pathWidget.value = filename;
+                pathWidget.callback?.(filename)
+            } else {
+                return
+            }
+            e.preventDefault()
+            e.stopImmediatePropagation()
+            return false
+        }, true)
     },
     async init() {
         if (app.VHSHelp != helpDOM) {