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

Address review comments from Bond

Browse Source
This commit is contained in:
PloughPuff 2019-02-27 16:33:08 +00:00 committed by Ploughpuff
parent 632968dc81
commit 8104e739d5
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,12 +282,18 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
}
/// <summary>
/// With the given path string, replaces the filename with ffprobe, taking case
/// of any file extension (like .exe on windows).
/// </summary>
/// <param name="appPath"></param>
/// <returns></returns>
private string GetProbePathFromEncoderPath(string appPath)
{
if (!string.IsNullOrEmpty(appPath))
{
string pattern = @"[^\/\\]+?(\.[^\/\\\n.]+)?$";
string substitution = @"ffprobe$1";
const string pattern = @"[^\/\\]+?(\.[^\/\\\n.]+)?$";
const string substitution = @"ffprobe$1";
return Regex.Replace(appPath, pattern, substitution);
}

10
MediaBrowser.Model/Configuration/EncodingOptions.cs
View File

@ -8,8 +8,14 @@ namespace MediaBrowser.Model.Configuration
public bool EnableThrottling { get; set; }
public int ThrottleDelaySeconds { get; set; }
public string HardwareAccelerationType { get; set; }
public string EncoderAppPathCustom { get; set; } // FFmpeg path as set by the user via the UI
public string EncoderAppPath { get; set; } // The current FFmpeg path being used by the system
/// <summary>
/// FFmpeg path as set by the user via the UI
/// </summary>
public string EncoderAppPathCustom { get; set; }
/// <summary>
/// The current FFmpeg path being used by the system
/// </summary>
public string EncoderAppPath { get; set; }
public string VaapiDevice { get; set; }
public int H264Crf { get; set; }
public string H264Preset { get; set; }