Skip to content

Commit 388b2c8

Browse files
committed
Add postproc.dll on check
1 parent 03e460e commit 388b2c8

File tree

1 file changed

+32
-26
lines changed

1 file changed

+32
-26
lines changed

CollapseLauncher/Classes/GameManagement/ImageBackground/ImageBackgroundManager.FFmpeg.cs

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ file static class Fields
2222
public const string DllNameAvfilter = "avfilter-10.dll";
2323
public const string DllNameAvformat = "avformat-61.dll";
2424
public const string DllNameAvutil = "avutil-59.dll";
25+
public const string DllNamePostproc = "postproc-58.dll";
2526
public const string DllNameSwresample = "swresample-5.dll";
2627
public const string DllNameSwscale = "swscale-8.dll";
2728
}
@@ -113,21 +114,23 @@ internal static bool IsFFmpegAvailable(string checkOnDirectory,
113114
{
114115
checkOnDirectory = FileUtility.GetFullyQualifiedPath(checkOnDirectory);
115116

116-
string dllPathAvcodec = Path.Combine(checkOnDirectory, Fields.DllNameAvcodec);
117-
string dllPathAvdevice = Path.Combine(checkOnDirectory, Fields.DllNameAvdevice);
118-
string dllPathAvfilter = Path.Combine(checkOnDirectory, Fields.DllNameAvfilter);
119-
string dllPathAvformat = Path.Combine(checkOnDirectory, Fields.DllNameAvformat);
120-
string dllPathAvutil = Path.Combine(checkOnDirectory, Fields.DllNameAvutil);
117+
string dllPathAvcodec = Path.Combine(checkOnDirectory, Fields.DllNameAvcodec);
118+
string dllPathAvdevice = Path.Combine(checkOnDirectory, Fields.DllNameAvdevice);
119+
string dllPathAvfilter = Path.Combine(checkOnDirectory, Fields.DllNameAvfilter);
120+
string dllPathAvformat = Path.Combine(checkOnDirectory, Fields.DllNameAvformat);
121+
string dllPathAvutil = Path.Combine(checkOnDirectory, Fields.DllNameAvutil);
122+
string dllPathPostproc = Path.Combine(checkOnDirectory, Fields.DllNamePostproc);
121123
string dllPathSwresample = Path.Combine(checkOnDirectory, Fields.DllNameSwresample);
122-
string dllPathSwscale = Path.Combine(checkOnDirectory, Fields.DllNameSwscale);
123-
124-
return FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvcodec, out _, out exception) &&
125-
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvdevice, out _, out exception) &&
126-
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvfilter, out _, out exception) &&
127-
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvformat, out _, out exception) &&
128-
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvutil, out _, out exception) &&
124+
string dllPathSwscale = Path.Combine(checkOnDirectory, Fields.DllNameSwscale);
125+
126+
return FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvcodec, out _, out exception) &&
127+
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvdevice, out _, out exception) &&
128+
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvfilter, out _, out exception) &&
129+
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvformat, out _, out exception) &&
130+
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvutil, out _, out exception) &&
131+
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathPostproc, out _, out exception) &&
129132
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathSwresample, out _, out exception) &&
130-
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathSwscale, out _, out exception);
133+
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathSwscale, out _, out exception);
131134
}
132135

133136
internal static string[] GetFFmpegRequiredDllFilenames() =>
@@ -137,6 +140,7 @@ internal static string[] GetFFmpegRequiredDllFilenames() =>
137140
Fields.DllNameAvfilter,
138141
Fields.DllNameAvformat,
139142
Fields.DllNameAvutil,
143+
Fields.DllNamePostproc,
140144
Fields.DllNameSwresample,
141145
Fields.DllNameSwscale
142146
];
@@ -182,21 +186,23 @@ public static bool TryLinkFFmpegLibrary(
182186
return false;
183187
}
184188

185-
string dllPathAvcodec = Path.Combine(sourceDir, Fields.DllNameAvcodec);
186-
string dllPathAvdevice = Path.Combine(sourceDir, Fields.DllNameAvdevice);
187-
string dllPathAvfilter = Path.Combine(sourceDir, Fields.DllNameAvfilter);
188-
string dllPathAvformat = Path.Combine(sourceDir, Fields.DllNameAvformat);
189-
string dllPathAvutil = Path.Combine(sourceDir, Fields.DllNameAvutil);
189+
string dllPathAvcodec = Path.Combine(sourceDir, Fields.DllNameAvcodec);
190+
string dllPathAvdevice = Path.Combine(sourceDir, Fields.DllNameAvdevice);
191+
string dllPathAvfilter = Path.Combine(sourceDir, Fields.DllNameAvfilter);
192+
string dllPathAvformat = Path.Combine(sourceDir, Fields.DllNameAvformat);
193+
string dllPathAvutil = Path.Combine(sourceDir, Fields.DllNameAvutil);
194+
string dllPathPostproc = Path.Combine(sourceDir, Fields.DllNamePostproc);
190195
string dllPathSwresample = Path.Combine(sourceDir, Fields.DllNameSwresample);
191-
string dllPathSwscale = Path.Combine(sourceDir, Fields.DllNameSwscale);
192-
193-
return CreateSymbolLink(dllPathAvcodec, targetDir, out exception) &&
194-
CreateSymbolLink(dllPathAvdevice, targetDir, out exception) &&
195-
CreateSymbolLink(dllPathAvfilter, targetDir, out exception) &&
196-
CreateSymbolLink(dllPathAvformat, targetDir, out exception) &&
197-
CreateSymbolLink(dllPathAvutil, targetDir, out exception) &&
196+
string dllPathSwscale = Path.Combine(sourceDir, Fields.DllNameSwscale);
197+
198+
return CreateSymbolLink(dllPathAvcodec, targetDir, out exception) &&
199+
CreateSymbolLink(dllPathAvdevice, targetDir, out exception) &&
200+
CreateSymbolLink(dllPathAvfilter, targetDir, out exception) &&
201+
CreateSymbolLink(dllPathAvformat, targetDir, out exception) &&
202+
CreateSymbolLink(dllPathAvutil, targetDir, out exception) &&
203+
CreateSymbolLink(dllPathPostproc, targetDir, out exception) &&
198204
CreateSymbolLink(dllPathSwresample, targetDir, out exception) &&
199-
CreateSymbolLink(dllPathSwscale, targetDir, out exception);
205+
CreateSymbolLink(dllPathSwscale, targetDir, out exception);
200206

201207
static bool CreateSymbolLink(string filePath,
202208
string targetDirectory,

0 commit comments

Comments
 (0)