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

Move MP4 faststart into GetFfmpegExportArgsOut

Browse Source
This commit is contained in:
n00mkrad
2022-08-05 11:58:12 +02:00
parent 2e908bc4bd
commit 8f36739adc
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Code/Main/Export.cs
View File

@@ -84,7 +84,7 @@ namespace Flowframes.Main
VidExtraData extraData = await FfmpegCommands.GetVidExtraInfo(s.inPath);
string extraArgsIn = FfmpegEncode.GetFfmpegExportArgsIn(s.outFps, s.outItsScale);
string extraArgsOut = FfmpegEncode.GetFfmpegExportArgsOut(fpsLimit ? maxFps : new Fraction(), extraData);
string extraArgsOut = FfmpegEncode.GetFfmpegExportArgsOut(fpsLimit ? maxFps : new Fraction(), extraData, s.outMode);
if (ffplay)
{

10
Code/Media/FfmpegEncode.cs
View File

@@ -37,8 +37,7 @@ namespace Flowframes.Media
{
string pre = i == 0 ? "" : $" && ffmpeg {AvProcess.GetFfmpegDefaultArgs()}";
string post = (i == 0 && encArgs.Length > 1) ? $"-f null -" : outPath.Wrap();
string fs = (!isChunk && outMode == Interpolate.OutMode.VidMp4) ? $"-movflags +faststart" : "";
args += $"{pre} -vsync 0 {GetFfmpegExportArgsIn(fps, itsScale)} {inArg} {encArgs[i]} {GetFfmpegExportArgsOut(resampleFps, extraData)} -threads {Config.GetInt(Config.Key.ffEncThreads)} {fs} {post} ";
args += $"{pre} -vsync 0 {GetFfmpegExportArgsIn(fps, itsScale)} {inArg} {encArgs[i]} {GetFfmpegExportArgsOut(resampleFps, extraData, Interpolate.currentSettings.outMode, isChunk)} {post} ";
}
await RunFfmpeg(args, framesFile.GetParentDir(), logMode, !isChunk);
@@ -51,7 +50,7 @@ namespace Flowframes.Media
return $"-r {fps}";
}
public static string GetFfmpegExportArgsOut (Fraction resampleFps, VidExtraData extraData)
public static string GetFfmpegExportArgsOut (Fraction resampleFps, VidExtraData extraData, Interpolate.OutMode outMode, bool isChunk = false)
{
List<string> filters = new List<string>();
string extraArgs = "";
@@ -67,7 +66,10 @@ namespace Flowframes.Media
}
if (!string.IsNullOrWhiteSpace(extraData.displayRatio) && !extraData.displayRatio.MatchesWildcard("*N/A*"))
extraArgs += $"-aspect {extraData.displayRatio}";
extraArgs += $" -aspect {extraData.displayRatio}";
if(!isChunk && outMode == Interpolate.OutMode.VidMp4)
extraArgs += $" -movflags +faststart";
return filters.Count > 0 ? $"-vf {string.Join(",", filters)}" : "" + $" {extraArgs}";
}