Mirrors/flowframes
1
0
Fork 0
mirror of https://github.com/n00mkrad/flowframes.git synced 2026-09-01 19:51:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support for fractional interpolation scene blending

Browse Source
This commit is contained in:
n00mkrad
2022-05-26 09:37:25 +02:00
parent 16d7a6715c
commit c96af52a7a
2 changed files with 72 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Code/Magick/Blend.cs
View File

@@ -35,8 +35,6 @@ namespace Flowframes.Magick
if (setStatus)
Program.mainForm.SetStatus("Blending scene transitions...");
int amountOfBlendFrames = (int)Interpolate.current.interpFactor - 1;
string[] frames = FrameRename.framesAreRenamed ? new string[0] : IoUtils.GetFilesSorted(Interpolate.current.framesFolder);
List<Task> runningTasks = new List<Task>();
@@ -49,9 +47,10 @@ namespace Flowframes.Magick
if (line.Contains(keyword))
{
string trimmedLine = line.Split(keyword).Last();
string[] inputFrameNames = trimmedLine.Split('>');
string frameFrom = FrameRename.framesAreRenamed ? inputFrameNames[0] : frames[inputFrameNames[0].GetInt()];
string frameTo = FrameRename.framesAreRenamed ? inputFrameNames[1] : frames[inputFrameNames[1].GetInt()];
string[] values = trimmedLine.Split('>');
string frameFrom = FrameRename.framesAreRenamed ? values[0] : frames[values[0].GetInt()];
string frameTo = FrameRename.framesAreRenamed ? values[1] : frames[values[1].GetInt()];
int amountOfBlendFrames = values[2].GetInt();
string img1 = Path.Combine(Interpolate.current.framesFolder, frameFrom);
string img2 = Path.Combine(Interpolate.current.framesFolder, frameTo);
@@ -78,7 +77,7 @@ namespace Flowframes.Magick
} while (runningTasks.Count >= maxThreads);
}
Logger.Log($"Starting task for transition {inputFrameNames[0]} > {inputFrameNames[1]} ({runningTasks.Count}/{maxThreads} running)", true);
Logger.Log($"Starting task for transition {values[0]} > {values[1]} ({runningTasks.Count}/{maxThreads} running)", true);
Task newTask = Task.Run(() => BlendImages(img1, img2, outputFilenames.ToArray()));
runningTasks.Add(newTask);
totalFrames += outputFilenames.Count;

84
Code/Main/FrameOrder.cs
View File

@@ -136,13 +136,52 @@ namespace Flowframes.Main
File.WriteAllText(framesFile + ".inputframes.json", JsonConvert.SerializeObject(inputFilenames, Formatting.Indented));
}
class FrameFileLine
{
public string OutFileName { get; set; } = "";
public string InFileNameFrom { get; set; } = "";
public string InFileNameTo { get; set; } = "";
public string InFileNameFromNext { get; set; } = "";
public string InFileNameToNext { get; set; } = "";
public float Timestep { get; set; } = -1;
public bool Discard { get; set; } = false;
public bool DiscardNext { get; set; } = false;
public int DiscardedFrames { get; set; } = 0;
public FrameFileLine (string outFileName, string inFilenameFrom, string inFilenameTo, string inFilenameToNext, float timestep, bool discard = false, bool discardNext = false, int discardedFrames = 0)
{
OutFileName = outFileName;
InFileNameFrom = inFilenameFrom;
InFileNameTo = inFilenameTo;
InFileNameFromNext = inFilenameTo;
InFileNameToNext = inFilenameToNext;
Timestep = timestep;
Discard = discard;
DiscardNext = discardNext;
DiscardedFrames = discardedFrames;
}
public override string ToString()
{
List<string> strings = new List<string>();
if (!string.IsNullOrWhiteSpace(InFileNameTo)) strings.Add($"to {InFileNameTo}");
if (Timestep >= 0f) strings.Add($"@ {Timestep.ToString("0.000000").Split('.').Last()}");
if (Discard) strings.Add("[Discard]");
if (DiscardNext) strings.Add($"SCN:{InFileNameFromNext}>{InFileNameToNext}>{DiscardedFrames}");
return $"file '{OutFileName}' # => {InFileNameFrom} {string.Join(" ", strings)}\n";
}
}
static async Task GenerateFrameLinesFloat(int sourceFrameCount, int targetFrameCount, float factor, bool sceneDetection, bool debug)
{
int totalFileCount = 0;
bool blendSceneChances = Config.GetInt(Config.Key.sceneChangeFillMode) > 0;
string ext = Interpolate.current.interpExt;
Fraction step = new Fraction(sourceFrameCount, targetFrameCount + InterpolateUtils.GetRoundedInterpFramesPerInputFrame(factor));
string fileContent = "";
List<FrameFileLine> lines = new List<FrameFileLine>();
string lastUndiscardFrame = "";
@@ -151,36 +190,47 @@ namespace Flowframes.Main
if (Interpolate.canceled) return;
float currentFrameTime = 1 + (step * i).GetFloat();
int sourceFrameIdx = (int)Math.Floor(currentFrameTime) - 1;
float timestep = (currentFrameTime - (int)Math.Floor(currentFrameTime));
string frames = (sourceFrameIdx + 1 >= frameFiles.Length) || timestep == 0f ? $"{frameFiles[sourceFrameIdx].Name}" : $"{frameFiles[sourceFrameIdx].Name} to {frameFiles[sourceFrameIdx + 1].Name}";
bool sceneChange = (sceneDetection && (sourceFrameIdx + 1) < FrameRename.importFilenames.Length && sceneFrames.Contains(GetNameNoExt(FrameRename.importFilenames[sourceFrameIdx + 1]))); // i+2 is in scene detection folder, means i+1 is ugly interp frame
string note = $"=> {frames} at {timestep.ToString("0.000000").Split('.').Last()}";
bool sceneChange = (sceneDetection && (sourceFrameIdx + 1) < FrameRename.importFilenames.Length && sceneFrames.Contains(GetNameNoExt(FrameRename.importFilenames[sourceFrameIdx + 1])));
string filename = $"{Paths.interpDir}/{(i + 1).ToString().PadLeft(Padding.interpFrames, '0')}{ext}";
if (string.IsNullOrWhiteSpace(lastUndiscardFrame))
lastUndiscardFrame = filename;
bool discardThisFrame = sceneChange && timestep != 0f;
if (discardThisFrame)
note += " [DISCARD]";
else
if (!sceneChange)
lastUndiscardFrame = filename;
fileContent += $"file '{(discardThisFrame ? lastUndiscardFrame : filename)}' # {note}\n";
string inputFilenameFrom = frameFiles[sourceFrameIdx].Name;
string inputFilenameTo = (sourceFrameIdx + 1 >= frameFiles.Length) ? "" : frameFiles[sourceFrameIdx + 1].Name;
string inputFilenameToNext = (sourceFrameIdx + 2 >= frameFiles.Length) ? "" : frameFiles[sourceFrameIdx + 2].Name;
lines.Add(new FrameFileLine(sceneChange && !blendSceneChances ? lastUndiscardFrame : filename, inputFilenameFrom, inputFilenameTo, inputFilenameToNext, timestep, sceneChange));
}
if (totalFileCount > lastOutFileCount)
lastOutFileCount = totalFileCount;
frameFileContents[0] = fileContent;
for(int lineIdx = 0; lineIdx < lines.Count; lineIdx++)
{
bool discardNext = lineIdx > 0 && (lineIdx + 1) < lines.Count && !lines.ElementAt(lineIdx).Discard && lines.ElementAt(lineIdx + 1).Discard;
int discardedFramesCount = 0;
if (discardNext)
{
for (int idx = lineIdx + 1; idx < lines.Count; idx++)
{
if (lines.ElementAt(idx).Discard)
discardedFramesCount++;
else
break;
}
}
lines.ElementAt(lineIdx).DiscardNext = discardNext;
lines.ElementAt(lineIdx).DiscardedFrames = discardedFramesCount;
}
frameFileContents[0] = String.Join("", lines);
}
static async Task GenerateFrameLines(int number, int startIndex, int count, int factor, bool sceneDetection, bool debug)