michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

update ffmpeg override behavior

Browse Source
This commit is contained in:
Luke Pulverenti 2016-11-01 14:29:29 -04:00
parent 445985218f
commit 8ab5e5aca9
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -121,6 +121,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
{ {
get get
{ {
if (_hasExternalEncoder)
{
return "External";
}
if (string.IsNullOrWhiteSpace(FFMpegPath)) if (string.IsNullOrWhiteSpace(FFMpegPath))
{ {
return null; return null;
@ -185,6 +190,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
{ {
ConfigureEncoderPaths(); ConfigureEncoderPaths();
if (_hasExternalEncoder)
{
LogPaths();
return;
}
// If the path was passed in, save it into config now. // If the path was passed in, save it into config now.
var encodingOptions = GetEncodingOptions(); var encodingOptions = GetEncodingOptions();
var appPath = encodingOptions.EncoderAppPath; var appPath = encodingOptions.EncoderAppPath;
@ -194,7 +205,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
if (!string.IsNullOrWhiteSpace(valueToSave)) if (!string.IsNullOrWhiteSpace(valueToSave))
{ {
// if using system variable, don't save this. // if using system variable, don't save this.
if (IsSystemInstalledPath(valueToSave)) if (IsSystemInstalledPath(valueToSave) || _hasExternalEncoder)
{ {
valueToSave = null; valueToSave = null;
} }
@ -209,6 +220,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
public async Task UpdateEncoderPath(string path, string pathType) public async Task UpdateEncoderPath(string path, string pathType)
{ {
if (_hasExternalEncoder)
{
return;
}
Tuple<string, string> newPaths; Tuple<string, string> newPaths;
if (string.Equals(pathType, "system", StringComparison.OrdinalIgnoreCase)) if (string.Equals(pathType, "system", StringComparison.OrdinalIgnoreCase))
@ -265,6 +281,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
private void ConfigureEncoderPaths() private void ConfigureEncoderPaths()
{ {
if (_hasExternalEncoder)
{
return;
}
var appPath = GetEncodingOptions().EncoderAppPath; var appPath = GetEncodingOptions().EncoderAppPath;
if (string.IsNullOrWhiteSpace(appPath)) if (string.IsNullOrWhiteSpace(appPath))