diff --git a/Code/AudioVideo/FFmpegCommands.cs b/Code/AudioVideo/FFmpegCommands.cs index d8891f2..0f6cbab 100644 --- a/Code/AudioVideo/FFmpegCommands.cs +++ b/Code/AudioVideo/FFmpegCommands.cs @@ -43,7 +43,7 @@ namespace Flowframes if (!sceneDetect) Logger.Log("Extracting video frames from input video..."); string sizeStr = (size.Width > 1 && size.Height > 1) ? $"-s {size.Width}x{size.Height}" : ""; IOUtils.CreateDir(frameFolderPath); - string timecodeStr = timecodes ? $"-copyts -r {FrameTiming.timebase} -frame_pts true" : "-copyts -frame_pts true"; + string timecodeStr = timecodes ? $"-copyts -r {FrameOrder.timebase} -frame_pts true" : "-copyts -frame_pts true"; string scnDetect = sceneDetect ? $"\"select='gt(scene,{Config.GetFloatString("scnDetectValue")})'\"" : ""; string mpStr = deDupe ? ((Config.GetInt("mpdecimateMode") == 0) ? mpDecDef : mpDecAggr) : ""; string filters = FormatUtils.ConcatStrings(new string[] { scnDetect, mpStr } ); diff --git a/Code/Main/FrameTiming.cs b/Code/Main/FrameOrder.cs similarity index 98% rename from Code/Main/FrameTiming.cs rename to Code/Main/FrameOrder.cs index 81a5c79..557b0a6 100644 --- a/Code/Main/FrameTiming.cs +++ b/Code/Main/FrameOrder.cs @@ -12,25 +12,25 @@ using System.Threading.Tasks; namespace Flowframes.Main { - class FrameTiming + class FrameOrder { public enum Mode { CFR, VFR } public static int timebase = 10000; public static async Task CreateTimecodeFiles(string framesPath, Mode mode, bool loopEnabled, int times, bool noTimestamps) { - Logger.Log("Generating timecodes..."); + Logger.Log("Generating frame order information..."); try { if (mode == Mode.VFR) await CreateTimecodeFile(framesPath, loopEnabled, times, false, noTimestamps); if (mode == Mode.CFR) await CreateEncFile(framesPath, loopEnabled, times, false); - Logger.Log($"Generating timecodes... Done.", false, true); + Logger.Log($"Generating frame order information... Done.", false, true); } catch (Exception e) { - Logger.Log($"Error generating timecodes: {e.Message}"); + Logger.Log($"Error generating frame order information: {e.Message}"); } } diff --git a/Code/Main/Interpolate.cs b/Code/Main/Interpolate.cs index 3d8596b..e7e7d25 100644 --- a/Code/Main/Interpolate.cs +++ b/Code/Main/Interpolate.cs @@ -133,7 +133,7 @@ namespace Flowframes if (canceled) return; bool useTimestamps = Config.GetInt("timingMode") == 1; // TODO: Auto-Disable timestamps if input frames are sequential, not timestamped - await FrameTiming.CreateTimecodeFiles(current.framesFolder, FrameTiming.Mode.CFR, Config.GetBool("enableLoop"), current.interpFactor, !useTimestamps); + await FrameOrder.CreateTimecodeFiles(current.framesFolder, FrameOrder.Mode.CFR, Config.GetBool("enableLoop"), current.interpFactor, !useTimestamps); if (canceled) return;