Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-06-26 17:08:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken hardware encoder and filter for trickplay (#11506)

Browse source
This commit is contained in:
gnattu 2024-05-07 21:23:28 +08:00 committed by GitHub
parent aaa42871ca
commit 4044431610
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
View file

@ -82,6 +82,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
"av1_amf", "av1_amf",
"h264_qsv", "h264_qsv",
"hevc_qsv", "hevc_qsv",
"mjpeg_qsv",
"av1_qsv", "av1_qsv",
"h264_nvenc", "h264_nvenc",
"hevc_nvenc", "hevc_nvenc",
@ -89,6 +90,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
"h264_vaapi", "h264_vaapi",
"hevc_vaapi", "hevc_vaapi",
"av1_vaapi", "av1_vaapi",
"mjpeg_vaapi",
"h264_v4l2m2m", "h264_v4l2m2m",
"h264_videotoolbox", "h264_videotoolbox",
"hevc_videotoolbox", "hevc_videotoolbox",

2
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View file

@ -848,7 +848,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
inputArg = "-threads " + threads + " " + inputArg; // HW accel args set a different input thread count, only set if disabled inputArg = "-threads " + threads + " " + inputArg; // HW accel args set a different input thread count, only set if disabled
} }
var filterParam = encodingHelper.GetVideoProcessingFilterParam(jobState, options, jobState.OutputVideoCodec).Trim(); var filterParam = encodingHelper.GetVideoProcessingFilterParam(jobState, options, vidEncoder).Trim();
if (string.IsNullOrWhiteSpace(filterParam)) if (string.IsNullOrWhiteSpace(filterParam))
{ {
throw new InvalidOperationException("EncodingHelper returned empty or invalid filter parameters."); throw new InvalidOperationException("EncodingHelper returned empty or invalid filter parameters.");