alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-12 02:30:23 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

add startup error handling

Browse Source
This commit is contained in:
Luke Pulverenti
2016-06-30 00:23:52 -04:00
parent cbeb77c0ad
commit 525f780453
8 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@@ -322,7 +322,7 @@ namespace MediaBrowser.Server.Startup.Common
await base.RunStartupTasks().ConfigureAwait(false);
InitMediaEncoder();
await MediaEncoder.Init().ConfigureAwait(false);
Logger.Info("ServerId: {0}", SystemId);
Logger.Info("Core startup complete");
@@ -350,20 +350,6 @@ namespace MediaBrowser.Server.Startup.Common
LogManager.RemoveConsoleOutput();
}
private void InitMediaEncoder()
{
MediaEncoder.Init();
Task.Run(() =>
{
var result = new FFmpegValidator(Logger, ApplicationPaths, FileSystemManager).Validate(MediaEncoder.EncoderPath);
var mediaEncoder = (MediaEncoder) MediaEncoder;
mediaEncoder.SetAvailableDecoders(result.Item1);
mediaEncoder.SetAvailableEncoders(result.Item2);
});
}
public override Task Init(IProgress<double> progress)
{
HttpPort = ServerConfigurationManager.Configuration.HttpServerPortNumber;

161
MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs
View File

@@ -1,161 +0,0 @@
using MediaBrowser.Common.Configuration;
using MediaBrowser.Model.Logging;
using System;
using System.Diagnostics;
using System.IO;
using System.Collections.Generic;
using CommonIO;
namespace MediaBrowser.Server.Startup.Common.FFMpeg
{
public class FFmpegValidator
{
private readonly ILogger _logger;
private readonly IApplicationPaths _appPaths;
private readonly IFileSystem _fileSystem;
public FFmpegValidator(ILogger logger, IApplicationPaths appPaths, IFileSystem fileSystem)
{
_logger = logger;
_appPaths = appPaths;
_fileSystem = fileSystem;
}
public Tuple<List<string>,List<string>> Validate(string encoderPath)
{
var decoders = GetDecoders(encoderPath);
var encoders = GetEncoders(encoderPath);
return new Tuple<List<string>, List<string>>(decoders, encoders);
}
private List<string> GetDecoders(string ffmpegPath)
{
string output = string.Empty;
try
{
output = GetFFMpegOutput(ffmpegPath, "-decoders");
}
catch
{
}
//_logger.Debug("ffmpeg decoder query result: {0}", output ?? string.Empty);
var found = new List<string>();
var required = new[]
{
"h264_qsv",
"mpeg2_qsv",
"vc1_qsv"
};
foreach (var codec in required)
{
var srch = " " + codec + " ";
if (output.IndexOf(srch, StringComparison.OrdinalIgnoreCase) == -1)
{
_logger.Warn("ffmpeg is missing decoder " + codec);
}
else
{
found.Add(codec);
}
}
return found;
}
private List<string> GetEncoders(string ffmpegPath)
{
string output = null;
try
{
output = GetFFMpegOutput(ffmpegPath, "-encoders");
}
catch
{
}
//_logger.Debug("ffmpeg encoder query result: {0}", output ?? string.Empty);
var found = new List<string>();
var required = new[]
{
"libx264",
"libx265",
"mpeg4",
"msmpeg4",
//"libvpx",
//"libvpx-vp9",
"aac",
"libmp3lame",
"libopus",
//"libvorbis",
"srt"
};
foreach (var codec in required)
{
var srch = " " + codec + " ";
if (output.IndexOf(srch, StringComparison.OrdinalIgnoreCase) == -1)
{
_logger.Warn("ffmpeg is missing encoder " + codec);
}
else
{
found.Add(codec);
}
}
return found;
}
private string GetFFMpegOutput(string path, string arguments)
{
var process = new Process
{
StartInfo = new ProcessStartInfo
{
CreateNoWindow = true,
UseShellExecute = false,
FileName = path,
Arguments = arguments,
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false,
RedirectStandardOutput = true,
RedirectStandardError = true
}
};
using (process)
{
process.Start();
try
{
process.BeginErrorReadLine();
using (var reader = new StreamReader(process.StandardOutput.BaseStream))
{
return reader.ReadToEnd();
}
}
catch
{
// Hate having to do this
try
{
process.Kill();
}
catch (Exception ex1)
{
_logger.ErrorException("Error killing ffmpeg", ex1);
}
throw;
}
}
}
}
}

1
MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
View File

@@ -68,7 +68,6 @@
<Compile Include="FFMpeg\FFMpegLoader.cs" />
<Compile Include="FFMpeg\FFMpegInstallInfo.cs" />
<Compile Include="FFMpeg\FFMpegInfo.cs" />
<Compile Include="FFMpeg\FFmpegValidator.cs" />
<Compile Include="INativeApp.cs" />
<Compile Include="MbLinkShortcutHandler.cs" />
<Compile Include="Migrations\CollectionGroupingMigration.cs" />