Firehawk52-backup/jellyfin
28
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 16:33:25 -03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12384 from evanjarrett/qsv-renderdevice

Browse Source 
Update QSV device args  to use the renderNodePath
This commit is contained in:
Bond-009
2024-09-04 16:06:07 +02:00
committed by GitHub
parent 3b2e4e27eb 6eec6c9957
commit 737a1b8a37
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -878,17 +878,23 @@ namespace MediaBrowser.Controller.MediaEncoding
renderNodePath);
}
private string GetQsvDeviceArgs(string alias)
private string GetQsvDeviceArgs(string renderNodePath, string alias)
{
var arg = " -init_hw_device qsv=" + (alias ?? QsvAlias);
if (OperatingSystem.IsLinux())
{
// derive qsv from vaapi device
return GetVaapiDeviceArgs(null, "iHD", "i915", null, VaapiAlias) + arg + "@" + VaapiAlias;
return GetVaapiDeviceArgs(renderNodePath, "iHD", "i915", null, VaapiAlias) + arg + "@" + VaapiAlias;
}
if (OperatingSystem.IsWindows())
{
// on Windows, the deviceIndex is an int
if (int.TryParse(renderNodePath, NumberStyles.Integer, CultureInfo.InvariantCulture, out int deviceIndex))
{
return GetD3d11vaDeviceArgs(deviceIndex, string.Empty, D3d11vaAlias) + arg + "@" + D3d11vaAlias;
}
// derive qsv from d3d11va device
return GetD3d11vaDeviceArgs(0, "0x8086", D3d11vaAlias) + arg + "@" + D3d11vaAlias;
}
@@ -1048,7 +1054,7 @@ namespace MediaBrowser.Controller.MediaEncoding
return string.Empty;
}
args.Append(GetQsvDeviceArgs(QsvAlias));
args.Append(GetQsvDeviceArgs(options.QsvDevice, QsvAlias));
var filterDevArgs = GetFilterHwDeviceArgs(QsvAlias);
// child device used by qsv.
if (_mediaEncoder.SupportsHwaccel("vaapi") || _mediaEncoder.SupportsHwaccel("d3d11va"))