2
0
Эх сурвалжийг харах

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

gnattu 1 жил өмнө
parent
commit
4044431610

+ 2 - 0
MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs

@@ -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",

+ 1 - 1
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

@@ -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.");