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

support h264_omx

Browse Source
This commit is contained in:
Luke Pulverenti
2016-06-30 14:59:18 -04:00
parent 4a95ec28f2
commit 52d8ddb050
4 changed files with 69 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,17 +27,16 @@ namespace MediaBrowser.MediaEncoding.Encoder
return new Tuple<List<string>, List<string>>(decoders, encoders);
}
private List<string> GetDecoders(string ffmpegPath)
private List<string> GetDecoders(string encoderAppPath)
{
string output = string.Empty;
try
{
output = GetFFMpegOutput(ffmpegPath, "-decoders");
output = GetProcessOutput(encoderAppPath, "-decoders");
}
catch
{
}
//_logger.Debug("ffmpeg decoder query result: {0}", output ?? string.Empty);
var found = new List<string>();
var required = new[]
@@ -51,12 +50,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
var srch = " " + codec + " ";
if (output.IndexOf(srch, StringComparison.OrdinalIgnoreCase) == -1)
{
_logger.Warn("ffmpeg is missing decoder " + codec);
}
else
if (output.IndexOf(srch, StringComparison.OrdinalIgnoreCase) != -1)
{
_logger.Info("Decoder available: " + codec);
found.Add(codec);
}
}
@@ -64,17 +60,16 @@ namespace MediaBrowser.MediaEncoding.Encoder
return found;
}
private List<string> GetEncoders(string ffmpegPath)
private List<string> GetEncoders(string encoderAppPath)
{
string output = null;
try
{
output = GetFFMpegOutput(ffmpegPath, "-encoders");
output = GetProcessOutput(encoderAppPath, "-encoders");
}
catch
{
}
//_logger.Debug("ffmpeg encoder query result: {0}", output ?? string.Empty);
var found = new List<string>();
var required = new[]
@@ -89,19 +84,18 @@ namespace MediaBrowser.MediaEncoding.Encoder
"libmp3lame",
"libopus",
//"libvorbis",
"srt"
"srt",
"libnvenc",
"h264_qsv"
};
foreach (var codec in required)
{
var srch = " " + codec + " ";
if (output.IndexOf(srch, StringComparison.OrdinalIgnoreCase) == -1)
{
_logger.Warn("ffmpeg is missing encoder " + codec);
}
else
if (output.IndexOf(srch, StringComparison.OrdinalIgnoreCase) != -1)
{
_logger.Info("Encoder available: " + codec);
found.Add(codec);
}
}
@@ -109,7 +103,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
return found;
}
private string GetFFMpegOutput(string path, string arguments)
private string GetProcessOutput(string path, string arguments)
{
var process = new Process
{
@@ -147,7 +141,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
catch (Exception ex1)
{
_logger.ErrorException("Error killing ffmpeg", ex1);
_logger.ErrorException("Error killing process", ex1);
}
throw;