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

Skip muxing from input if input is frames, not a video

Browse Source
This commit is contained in:
N00MKRAD
2021-04-05 12:04:23 +02:00
parent 9287ec6b77
commit dae349460c
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Code/Main/CreateVideo.cs
View File

@@ -10,6 +10,7 @@ using I = Flowframes.Interpolate;
using System.Diagnostics; using System.Diagnostics;
using Flowframes.Data; using Flowframes.Data;
using Flowframes.Media; using Flowframes.Media;
using Microsoft.VisualBasic.Logging;
namespace Flowframes.Main namespace Flowframes.Main
{ {
@@ -231,6 +232,12 @@ namespace Flowframes.Main
bool muxFromInput = Config.GetInt("audioSubTransferMode") == 0; bool muxFromInput = Config.GetInt("audioSubTransferMode") == 0;
if (muxFromInput && I.current.inputIsFrames)
{
Logger.Log("Skipping muxing from input step as there is no input video, only frames.", true);
return;
}
try try
{ {
if (muxFromInput) if (muxFromInput)

4
Code/Main/InterpolateUtils.cs
View File

@@ -170,7 +170,7 @@ namespace Flowframes.Main
} }
catch (Exception e) catch (Exception e)
{ {
Logger.Log("Error updating preview: " + e.Message, true); //Logger.Log("Error updating preview: " + e.Message, true);
} }
} }
@@ -295,7 +295,7 @@ namespace Flowframes.Main
return Path.Combine(basePath, Path.GetFileNameWithoutExtension(inPath).StripBadChars().Remove(" ").Trunc(30, false) + "-temp"); return Path.Combine(basePath, Path.GetFileNameWithoutExtension(inPath).StripBadChars().Remove(" ").Trunc(30, false) + "-temp");
} }
public static bool InputIsValid(string inDir, string outDir, Fraction fpsOut, float factor, Interpolate.OutMode outMode) public static bool InputIsValid(string inDir, string outDir, Fraction fpsOut, float factor, I.OutMode outMode)
{ {
bool passes = true; bool passes = true;