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

Fix concat file extension detection

Browse Source
This commit is contained in:
N00MKRAD
2021-05-20 22:06:15 +02:00
parent 8e14c61186
commit ae90d158f6
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Code/Media/FfmpegEncode.cs
View File

@@ -1,6 +1,7 @@
using Flowframes.Data; using Flowframes.Data;
using Flowframes.IO; using Flowframes.IO;
using Flowframes.MiscUtils; using Flowframes.MiscUtils;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@@ -27,10 +28,7 @@ namespace Flowframes.Media
if (Config.GetBool(Config.Key.allowSymlinkEncoding, true) && Symlinks.SymlinksAllowed()) if (Config.GetBool(Config.Key.allowSymlinkEncoding, true) && Symlinks.SymlinksAllowed())
{ {
if (await Symlinks.MakeSymlinksForEncode(framesFile, linksDir, Padding.interpFrames)) if (await Symlinks.MakeSymlinksForEncode(framesFile, linksDir, Padding.interpFrames))
{ inArg = $"-i \"{linksDir}/%{Padding.interpFrames}d{GetConcatFileExt(framesFile)}\"";
string ext = Path.GetExtension(File.ReadAllLines(framesFile).FirstOrDefault()).Remove("'");
inArg = $"-i \"{linksDir}/%{Padding.interpFrames}d{ext}\"";
}
} }
string extraArgs = Config.Get(Config.Key.ffEncArgs); string extraArgs = Config.Get(Config.Key.ffEncArgs);
@@ -54,6 +52,11 @@ namespace Flowframes.Media
IOUtils.TryDeleteIfExists(linksDir); IOUtils.TryDeleteIfExists(linksDir);
} }
public static string GetConcatFileExt (string concatFilePath)
{
return Path.GetExtension(File.ReadAllLines(concatFilePath).FirstOrDefault().Split('\'')[1]);
}
static string GetAspectArg (VidExtraData extraData) static string GetAspectArg (VidExtraData extraData)
{ {
if (!string.IsNullOrWhiteSpace(extraData.displayRatio) && !extraData.displayRatio.MatchesWildcard("*N/A*")) if (!string.IsNullOrWhiteSpace(extraData.displayRatio) && !extraData.displayRatio.MatchesWildcard("*N/A*"))
@@ -71,7 +74,7 @@ namespace Flowframes.Media
if (Config.GetBool(Config.Key.allowSymlinkEncoding, true) && Symlinks.SymlinksAllowed()) if (Config.GetBool(Config.Key.allowSymlinkEncoding, true) && Symlinks.SymlinksAllowed())
{ {
if (await Symlinks.MakeSymlinksForEncode(framesFile, linksDir, Padding.interpFrames)) if (await Symlinks.MakeSymlinksForEncode(framesFile, linksDir, Padding.interpFrames))
inArg = $"-i {Path.GetFileName(framesFile) + Paths.symlinksSuffix}/%{Padding.interpFrames}d.png"; inArg = $"-i {Path.GetFileName(framesFile) + Paths.symlinksSuffix}/%{Padding.interpFrames}d{GetConcatFileExt(framesFile)}";
} }
string rate = fps.ToString().Replace(",", "."); string rate = fps.ToString().Replace(",", ".");

5
Code/Media/FfmpegExtract.cs
View File

@@ -200,10 +200,7 @@ namespace Flowframes.Media
if (Config.GetBool(Config.Key.allowSymlinkEncoding, true) && Symlinks.SymlinksAllowed()) if (Config.GetBool(Config.Key.allowSymlinkEncoding, true) && Symlinks.SymlinksAllowed())
{ {
if (await Symlinks.MakeSymlinksForEncode(concatFile, linksDir, Padding.interpFrames)) if (await Symlinks.MakeSymlinksForEncode(concatFile, linksDir, Padding.interpFrames))
{ inArg = $"-i \"{linksDir}/%{Padding.interpFrames}d{FfmpegEncode.GetConcatFileExt(concatFile)}\"";
string ext = Path.GetExtension(File.ReadAllLines(concatFile).FirstOrDefault()).Remove("'");
inArg = $"-i \"{linksDir}/%{Padding.interpFrames}d{ext}\"";
}
} }
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}" : "";