starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 22:43:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rebase

Browse Source
This commit is contained in:
Bond_009
2018-12-15 00:48:06 +01:00
parent a8fde5e89c
commit 0c1b9d3bff
27 changed files with 158 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using MediaBrowser.Model.Diagnostics;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
namespace MediaBrowser.MediaEncoding.Encoder
{
@@ -20,12 +20,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
public Tuple<List<string>, List<string>> Validate(string encoderPath)
{
_logger.Info("Validating media encoder at {0}", encoderPath);
_logger.LogInformation("Validating media encoder at {0}", encoderPath);
var decoders = GetDecoders(encoderPath);
var encoders = GetEncoders(encoderPath);
_logger.Info("Encoder validation complete");
_logger.LogInformation("Encoder validation complete");
return new Tuple<List<string>, List<string>>(decoders, encoders);
}
@@ -41,7 +41,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
if (logOutput)
{
_logger.ErrorException("Error validating encoder", ex);
_logger.LogError("Error validating encoder", ex);
}
}
@@ -50,7 +50,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
return false;
}
_logger.Info("ffmpeg info: {0}", output);
_logger.LogInformation("ffmpeg info: {0}", output);
if (output.IndexOf("Libav developers", StringComparison.OrdinalIgnoreCase) != -1)
{
@@ -80,7 +80,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
catch (Exception )
{
//_logger.ErrorException("Error detecting available decoders", ex);
//_logger.LogError("Error detecting available decoders", ex);
}
var found = new List<string>();
@@ -107,7 +107,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
if (output.IndexOf(srch, StringComparison.OrdinalIgnoreCase) != -1)
{
_logger.Info("Decoder available: " + codec);
_logger.LogInformation("Decoder available: " + codec);
found.Add(codec);
}
}
@@ -163,7 +163,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
if (index < required.Length - 1)
{
_logger.Info("Encoder available: " + codec);
_logger.LogInformation("Encoder available: " + codec);
}
found.Add(codec);
@@ -187,7 +187,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
RedirectStandardOutput = true
});
_logger.Info("Running {0} {1}", path, arguments);
_logger.LogInformation("Running {0} {1}", path, arguments);
using (process)
{
@@ -199,7 +199,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
catch
{
_logger.Info("Killing process {0} {1}", path, arguments);
_logger.LogInformation("Killing process {0} {1}", path, arguments);
// Hate having to do this
try
@@ -208,7 +208,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
catch (Exception ex1)
{
_logger.ErrorException("Error killing process", ex1);
_logger.LogError("Error killing process", ex1);
}
throw;