浏览代码

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

Nyanmisaka 8 月之前
父节点
当前提交
cb8f01065a
共有 1 个文件被更改,包括 8 次插入0 次删除
  1. 8 0
      MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

+ 8 - 0
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -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)