Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-23 15:30:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix MJPEG hwenc may be incorrectly enabled on AMDGPU (#12695)

Browse Source
This commit is contained in:
Nyanmisaka 2024-09-24 01:24:49 +08:00 committed by GitHub
parent 3c639c2e80
commit cb8f01065a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,6 +209,14 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
var hwType = encodingOptions.HardwareAccelerationType; var hwType = encodingOptions.HardwareAccelerationType;
// Only Intel has VA-API MJPEG encoder
if (hwType == HardwareAccelerationType.vaapi
&& !(_mediaEncoder.IsVaapiDeviceInteliHD
|| _mediaEncoder.IsVaapiDeviceInteli965))
{
return _defaultMjpegEncoder;
}
if (hwType != HardwareAccelerationType.none if (hwType != HardwareAccelerationType.none
&& encodingOptions.EnableHardwareEncoding && encodingOptions.EnableHardwareEncoding
&& _mjpegCodecMap.TryGetValue(hwType, out var preferredEncoder) && _mjpegCodecMap.TryGetValue(hwType, out var preferredEncoder)