alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-19 04:34:18 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #2251 from nyanmisaka/master

Browse Source 
add support for AMD AMF hardware encoding on Windows & Linux
This commit is contained in:
dkanada
2020-01-16 15:26:46 +09:00
committed by GitHub
parent 884c3e5614 2c10891b66
commit 4aa0b940e3
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@@ -2642,22 +2642,9 @@ namespace MediaBrowser.Controller.MediaEncoding
else
return "-hwaccel dxva2";
}
switch (videoStream.Codec.ToLowerInvariant())
else
{
case "avc":
case "h264":
if (_mediaEncoder.SupportsDecoder("h264_amf") && encodingOptions.HardwareDecodingCodecs.Contains("h264", StringComparer.OrdinalIgnoreCase))
{
return "-c:v h264_amf";
}
break;
case "mpeg2video":
if (_mediaEncoder.SupportsDecoder("hevc_amf") && encodingOptions.HardwareDecodingCodecs.Contains("mpeg2video", StringComparer.OrdinalIgnoreCase))
{
return "-c:v mpeg2_mmal";
}
break;
return "-hwaccel vaapi";
}
}
}