Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions src/BuiltinExtensions/ComfyUIBackend/WorkflowGeneratorSteps.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1984,6 +1984,38 @@ void altLatent(ImageToVideoGenInfo genInfo)
#region Extend Video
AddStep(g =>
{
WGNodeData ensureAttachedAudio(WGNodeData media)
{
if (media?.AttachedAudio is null || media.AttachedAudio.DataType == WGNodeData.DT_AUDIO || g.CurrentAudioVae is null)
{
return media;
}
WGNodeData dup = media.Duplicate();
dup.AttachedAudio = media.AttachedAudio.DecodeLatents(g.CurrentAudioVae, true);
return dup;
}
WGNodeData appendAudio(WGNodeData combinedAudio, WGNodeData nextAudio)
{
if (nextAudio is null)
{
return combinedAudio;
}
if (combinedAudio is null)
{
return nextAudio;
}
if (combinedAudio.DataType != WGNodeData.DT_AUDIO || nextAudio.DataType != WGNodeData.DT_AUDIO)
{
return combinedAudio;
}
string concatNode = g.CreateNode("AudioConcat", new JObject()
{
["audio1"] = combinedAudio.Path,
["audio2"] = nextAudio.Path,
["direction"] = "after"
});
return combinedAudio.WithPath([concatNode, 0], WGNodeData.DT_AUDIO, combinedAudio.Compat ?? nextAudio.Compat);
}
string fullRawPrompt = g.UserInput.Get(T2IParamTypes.Prompt, "");
if (fullRawPrompt.Contains("<extend:"))
{
Expand All @@ -1998,6 +2030,7 @@ void altLatent(ImageToVideoGenInfo genInfo)
PromptRegion regionalizer = new(fullRawPrompt);
List<JArray> vidChunks = [g.CurrentMedia.Path];
WGNodeData conjoinedLast = g.CurrentMedia;
WGNodeData conjoinedAudio = ensureAttachedAudio(conjoinedLast)?.AttachedAudio;
string getWidthNode = g.CreateNode("SwarmImageWidth", new JObject()
{
["image"] = g.CurrentMedia.Path
Expand Down Expand Up @@ -2057,6 +2090,7 @@ void altLatent(ImageToVideoGenInfo genInfo)
};
g.CreateImageToVideo(genInfo);
g.CurrentMedia = g.CurrentMedia.AsRawImage(genInfo.Vae);
WGNodeData stageWithAudio = ensureAttachedAudio(g.CurrentMedia);
videoFps = genInfo.VideoFPS;
g.CurrentMedia.FPS = videoFps ?? g.CurrentMedia.FPS;
if (saveIntermediate)
Expand All @@ -2071,12 +2105,14 @@ void altLatent(ImageToVideoGenInfo genInfo)
});
g.CurrentMedia = g.CurrentMedia.WithPath([cutNode, 0]);
vidChunks.Add(g.CurrentMedia.Path);
conjoinedAudio = appendAudio(conjoinedAudio, stageWithAudio?.AttachedAudio);
string batchedNode = g.CreateNode("ImageBatch", new JObject()
{
["image1"] = conjoinedLast.Path,
["image2"] = g.CurrentMedia.Path
});
conjoinedLast = conjoinedLast.WithPath([batchedNode, 0]);
conjoinedLast.AttachedAudio = conjoinedAudio;
}
g.CurrentMedia = conjoinedLast;
g.CurrentMedia.FPS = videoFps ?? g.CurrentMedia.FPS;
Expand Down
Loading