mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-08 04:18:06 +02:00
Clean GetHwaccelType Windows handling a tiny bit
This commit is contained in:
parent
628734931c
commit
3e381cfd5e
1 changed files with 7 additions and 7 deletions
|
@ -2880,21 +2880,21 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string GetHwaccelType(EncodingJobInfo state, EncodingOptions options, string videoCodec)
|
public string GetHwaccelType(EncodingJobInfo state, EncodingOptions options, string videoCodec)
|
||||||
{
|
{
|
||||||
var IsWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
|
var isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
|
||||||
var IsNewWindows = Environment.OSVersion.Version.Major > 6 || (Environment.OSVersion.Version.Major == 6 && Environment.OSVersion.Version.Minor > 1);
|
var isWindows8orLater = Environment.OSVersion.Version.Major > 6 || (Environment.OSVersion.Version.Major == 6 && Environment.OSVersion.Version.Minor > 1);
|
||||||
var IsDxvaSupported = _mediaEncoder.SupportsHwaccel("dxva2") || _mediaEncoder.SupportsHwaccel("d3d11va");
|
var isDxvaSupported = _mediaEncoder.SupportsHwaccel("dxva2") || _mediaEncoder.SupportsHwaccel("d3d11va");
|
||||||
|
|
||||||
if ((IsDxvaSupported || IsVaapiSupported(state)) && options.HardwareDecodingCodecs.Contains(videoCodec, StringComparer.OrdinalIgnoreCase))
|
if ((isDxvaSupported || IsVaapiSupported(state)) && options.HardwareDecodingCodecs.Contains(videoCodec, StringComparer.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
if (!IsWindows)
|
if (!isWindows)
|
||||||
{
|
{
|
||||||
return "-hwaccel vaapi";
|
return "-hwaccel vaapi";
|
||||||
}
|
}
|
||||||
else if (IsWindows && IsNewWindows)
|
else if (isWindows8orLater)
|
||||||
{
|
{
|
||||||
return "-hwaccel d3d11va";
|
return "-hwaccel d3d11va";
|
||||||
}
|
}
|
||||||
else if (IsWindows && !IsNewWindows)
|
else
|
||||||
{
|
{
|
||||||
return "-hwaccel dxva2";
|
return "-hwaccel dxva2";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue