majomi/intro-skipper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23 from nyanmisaka/fix-deadlock

Browse Source 
Fix the deadlock of ffmpeg process on Windows
This commit is contained in:
ConfusedPolarBear 2022-06-15 18:25:27 -05:00 committed by GitHub
commit d5f57f3ca7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ConfusedPolarBear.Plugin.IntroSkipper/Chromaprint.cs
View File

@ -114,9 +114,14 @@ public static class Chromaprint
var info = new ProcessStartInfo(ffmpegPath, args) var info = new ProcessStartInfo(ffmpegPath, args)
{ {
WindowStyle = ProcessWindowStyle.Hidden,
CreateNoWindow = true, CreateNoWindow = true,
UseShellExecute = false,
ErrorDialog = false,
// We only consume standardOutput.
RedirectStandardOutput = true, RedirectStandardOutput = true,
RedirectStandardError = true RedirectStandardError = false
}; };
var ffmpeg = new Process var ffmpeg = new Process
@ -125,7 +130,6 @@ public static class Chromaprint
}; };
ffmpeg.Start(); ffmpeg.Start();
ffmpeg.WaitForExit(timeout);
using (MemoryStream ms = new MemoryStream()) using (MemoryStream ms = new MemoryStream())
{ {
@ -139,6 +143,8 @@ public static class Chromaprint
} }
while (bytesRead > 0); while (bytesRead > 0);
ffmpeg.WaitForExit(timeout);
return ms.ToArray().AsSpan(); return ms.ToArray().AsSpan();
} }
} }