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

Batch Processing fixes and improvements

Browse Source
This commit is contained in:
N00MKRAD
2021-05-30 15:03:24 +02:00
parent c53bf9166f
commit 2fda79aad7
6 changed files with 48 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Code/Media/FfmpegCommands.cs
View File

@@ -109,6 +109,7 @@ namespace Flowframes
if (entry.Contains(" fps") && !entry.Contains("Input ")) // Avoid reading FPS from the filename, in case filename contains "fps"
{
string num = entry.Replace(" fps", "").Trim().Replace(",", ".");
Logger.Log($"Float FPS from ffmpeg: {num.GetFloat()}", true, false, "ffmpeg");
ffmpegFps = new Fraction(num.GetFloat());
}
}
@@ -118,10 +119,14 @@ namespace Flowframes
Logger.Log("GetFramerate ffmpeg Error: " + ffmpegEx.Message, true, false);
}
if(preferFfmpeg)
Logger.Log($"ffmpegFps.GetFloat() = {ffmpegFps.GetFloat()}", true, false, "ffmpeg");
if (preferFfmpeg)
{
Logger.Log($"preferring ffmpeg");
if (ffmpegFps.GetFloat() > 0)
return ffmpegFps;
{ Logger.Log($"returning {ffmpegFps}"); return ffmpegFps; }
else
return ffprobeFps;
}

2
Code/Media/FfmpegExtract.cs
View File

@@ -75,7 +75,7 @@ namespace Flowframes.Media
public static async Task VideoToFrames(string inputFile, string framesDir, bool alpha, Fraction rate, bool deDupe, bool delSrc, Size size, string format)
{
Logger.Log("Extracting video frames from input video...");
Logger.Log($"VideoToFrames() - Alpha: {alpha} - Size: {size}", true, false, "ffmpeg");
Logger.Log($"VideoToFrames() - Alpha: {alpha} - Rate: {rate} - Size: {size} - Format: {format}", true, false, "ffmpeg");
string sizeStr = (size.Width > 1 && size.Height > 1) ? $"-s {size.Width}x{size.Height}" : "";
IOUtils.CreateDir(framesDir);
string mpStr = deDupe ? ((Config.GetInt(Config.Key.mpdecimateMode) == 0) ? mpDecDef : mpDecAggr) : "";