diff options
| author | Nyanmisaka <nst799610810@gmail.com> | 2024-09-24 01:24:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-23 11:24:49 -0600 |
| commit | cb8f01065a03a5ba546c1ff33c7452d81c32da62 (patch) | |
| tree | af21355f45952db92457a6f2e6a46726d884b4e3 | |
| parent | 3c639c2e80f2a17eea3f5f1a70c1b287bc99aba4 (diff) | |
Fix MJPEG hwenc may be incorrectly enabled on AMDGPU (#12695)
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 557eb5e32..7076ed087 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -209,6 +209,14 @@ namespace MediaBrowser.Controller.MediaEncoding { 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 && encodingOptions.EnableHardwareEncoding && _mjpegCodecMap.TryGetValue(hwType, out var preferredEncoder) |