Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-08 02:34:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8516 from cvium/kill_ffprobe_when_extraction_crashes

Browse Source
This commit is contained in:
Claus Vium 2022-10-09 08:27:34 +02:00 committed by GitHub
commit 6d23de64c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Jellyfin.MediaEncoding.Keyframes/FfProbe/FfProbeKeyframeExtractor.cs
View File

@ -38,10 +38,29 @@ public static class FfProbeKeyframeExtractor
EnableRaisingEvents = true EnableRaisingEvents = true
}; };
try
{
process.Start(); process.Start();
return ParseStream(process.StandardOutput); return ParseStream(process.StandardOutput);
} }
catch (Exception)
{
try
{
if (!process.HasExited)
{
process.Kill();
}
}
catch
{
// We do not care if this fails
}
throw;
}
}
internal static KeyframeData ParseStream(StreamReader reader) internal static KeyframeData ParseStream(StreamReader reader)
{ {