Mirrors/flowframes
1
0
Fork 0
mirror of https://github.com/n00mkrad/flowframes.git synced 2025-12-22 03:09:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

encoding tests

Browse Source
This commit is contained in:
N00MKRAD
2020-12-29 16:01:24 +01:00
parent a226e3f352
commit f258cdde95
4 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Code/AudioVideo/FFmpegCommands.cs
View File

@@ -2,6 +2,7 @@
using Flowframes.Data; using Flowframes.Data;
using Flowframes.IO; using Flowframes.IO;
using Flowframes.Main; using Flowframes.Main;
using Flowframes.MiscUtils;
using System; using System;
using System.Drawing; using System.Drawing;
using System.Globalization; using System.Globalization;
@@ -42,10 +43,12 @@ namespace Flowframes
if (!sceneDetect) Logger.Log("Extracting video frames from input video..."); if (!sceneDetect) Logger.Log("Extracting video frames from input video...");
string sizeStr = (size.Width > 1 && size.Height > 1) ? $"-s {size.Width}x{size.Height}" : ""; string sizeStr = (size.Width > 1 && size.Height > 1) ? $"-s {size.Width}x{size.Height}" : "";
IOUtils.CreateDir(frameFolderPath); IOUtils.CreateDir(frameFolderPath);
string timecodeStr = timecodes ? "-copyts -r 10000 -frame_pts true" : ""; string timecodeStr = timecodes ? $"-copyts -r {FrameTiming.timebase} -frame_pts true" : "";
string scnDetect = sceneDetect ? $"\"select='gt(scene,{Config.GetFloatString("scnDetectValue")})'\"" : ""; string scnDetect = sceneDetect ? $"\"select='gt(scene,{Config.GetFloatString("scnDetectValue")})'\"" : "";
string mpStr = deDupe ? ((Config.GetInt("mpdecimateMode") == 0) ? mpDecDef : mpDecAggr) : ""; string mpStr = deDupe ? ((Config.GetInt("mpdecimateMode") == 0) ? mpDecDef : mpDecAggr) : "";
string vf = (scnDetect.Length > 2 || mpStr.Length > 2) ? $"-vf {scnDetect},{mpStr} ".ListCommaFix() : ""; string fpsFilter = $"\"fps=fps={Interpolate.current.inFps.ToString().Replace(",", ".")}\"";
string filters = FormatUtils.ConcatStrings(new string[] { scnDetect, mpStr, fpsFilter } );
string vf = filters.Length > 2 ? $"-vf {filters}" : "";
string pad = Padding.inputFrames.ToString(); string pad = Padding.inputFrames.ToString();
string args = $"-i {inputFile.Wrap()} {pngComprArg} -vsync 0 -pix_fmt rgb24 {timecodeStr} {vf} {sizeStr} \"{frameFolderPath}/%{pad}d.png\""; string args = $"-i {inputFile.Wrap()} {pngComprArg} -vsync 0 -pix_fmt rgb24 {timecodeStr} {vf} {sizeStr} \"{frameFolderPath}/%{pad}d.png\"";
AvProcess.LogMode logMode = Interpolate.currentInputFrameCount > 50 ? AvProcess.LogMode.OnlyLastLine : AvProcess.LogMode.Hidden; AvProcess.LogMode logMode = Interpolate.currentInputFrameCount > 50 ? AvProcess.LogMode.OnlyLastLine : AvProcess.LogMode.Hidden;

5
Code/ExtensionMethods.cs
View File

@@ -155,10 +155,5 @@ namespace Flowframes
return str.Remove(place, stringToReplace.Length).Insert(place, replaceWith); return str.Remove(place, stringToReplace.Length).Insert(place, replaceWith);
} }
public static string ListCommaFix (this string str)
{
return str.Replace(" , ", " ").Replace(" ,", " ").Replace(", ", " ");
}
} }
} }

6
Code/Main/FrameTiming.cs
View File

@@ -14,6 +14,8 @@ namespace Flowframes.Main
{ {
class FrameTiming class FrameTiming
{ {
public static int timebase = 10000;
public static async Task CreateTimecodeFiles(string framesPath, bool loopEnabled, int times, bool noTimestamps) public static async Task CreateTimecodeFiles(string framesPath, bool loopEnabled, int times, bool noTimestamps)
{ {
Logger.Log("Generating timecodes..."); Logger.Log("Generating timecodes...");
@@ -79,7 +81,7 @@ namespace Flowframes.Main
{ {
//Logger.Log($"Writing out frame {frm+1}/{interpFramesAmount}", true); //Logger.Log($"Writing out frame {frm+1}/{interpFramesAmount}", true);
string durationStr = (durationPerInterpFrame / 10000f).ToString("0.00000", CultureInfo.InvariantCulture); string durationStr = (durationPerInterpFrame / timebase).ToString("0.0000000", CultureInfo.InvariantCulture);
if (discardThisFrame && totalFileCount > 1) // Never discard 1st frame if (discardThisFrame && totalFileCount > 1) // Never discard 1st frame
{ {
@@ -115,7 +117,7 @@ namespace Flowframes.Main
} }
// Use average frame duration for last frame - TODO: Use real duration?? // Use average frame duration for last frame - TODO: Use real duration??
string durationStrLast = ((totalDuration / totalFileCount) / 10000f).ToString("0.00000", CultureInfo.InvariantCulture); string durationStrLast = ((totalDuration / (totalFileCount - 1)) / timebase).ToString("0.0000000", CultureInfo.InvariantCulture);
fileContent += $"file '{interpPath}/{totalFileCount.ToString().PadLeft(Padding.interpFrames, '0')}.{ext}'\nduration {durationStrLast}\n"; fileContent += $"file '{interpPath}/{totalFileCount.ToString().PadLeft(Padding.interpFrames, '0')}.{ext}'\nduration {durationStrLast}\n";
totalFileCount++; totalFileCount++;

18
Code/MiscUtils/FormatUtils.cs
View File

@@ -68,5 +68,23 @@ namespace Flowframes.MiscUtils
double ratio = Math.Round(((float)numTo / (float)numFrom) * 100f); double ratio = Math.Round(((float)numTo / (float)numFrom) * 100f);
return ratio + "%"; return ratio + "%";
} }
public static string ConcatStrings(string[] strings, char delimiter = ',', bool distinct = false)
{
string outStr = "";
strings = strings.Where(s => !string.IsNullOrWhiteSpace(s)).ToArray();
if(distinct)
strings = strings.Distinct().ToArray();
for (int i = 0; i < strings.Length; i++)
{
outStr += strings[i];
if (i + 1 != strings.Length)
outStr += delimiter;
}
return outStr;
}
} }
} }