Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12673 from nyanmisaka/rkmppdec-nokey

Browse Source 
Enable key-frame only decoding for RKMPP trickplay
This commit is contained in:
Bond-009 2024-09-20 11:49:27 +02:00 committed by GitHub
commit e005c32151
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -804,7 +804,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
|| (hardwareAccelerationType == HardwareAccelerationType.amf && OperatingSystem.IsWindows()) || (hardwareAccelerationType == HardwareAccelerationType.amf && OperatingSystem.IsWindows())
|| (hardwareAccelerationType == HardwareAccelerationType.qsv && options.PreferSystemNativeHwDecoder) || (hardwareAccelerationType == HardwareAccelerationType.qsv && options.PreferSystemNativeHwDecoder)
|| hardwareAccelerationType == HardwareAccelerationType.vaapi || hardwareAccelerationType == HardwareAccelerationType.vaapi
|| hardwareAccelerationType == HardwareAccelerationType.videotoolbox; || hardwareAccelerationType == HardwareAccelerationType.videotoolbox
|| hardwareAccelerationType == HardwareAccelerationType.rkmpp;
if (!supportsKeyFrameOnly) if (!supportsKeyFrameOnly)
{ {
// Disable hardware acceleration when the hardware decoder does not support keyframe only mode. // Disable hardware acceleration when the hardware decoder does not support keyframe only mode.
@ -930,13 +931,14 @@ namespace MediaBrowser.MediaEncoding.Encoder
// Final command arguments // Final command arguments
var args = string.Format( var args = string.Format(
CultureInfo.InvariantCulture, CultureInfo.InvariantCulture,
"-loglevel error {0} -an -sn {1} -threads {2} -c:v {3} {4}{5}-f {6} \"{7}\"", "-loglevel error {0} -an -sn {1} -threads {2} -c:v {3} {4}{5}{6}-f {7} \"{8}\"",
inputArg, inputArg,
filterParam, filterParam,
outputThreads.GetValueOrDefault(_threads), outputThreads.GetValueOrDefault(_threads),
vidEncoder, vidEncoder,
encoderQualityOption + encoderQuality + " ", encoderQualityOption + encoderQuality + " ",
vidEncoder.Contains("videotoolbox", StringComparison.InvariantCultureIgnoreCase) ? "-allow_sw 1 " : string.Empty, // allow_sw fallback for some intel macs vidEncoder.Contains("videotoolbox", StringComparison.InvariantCultureIgnoreCase) ? "-allow_sw 1 " : string.Empty, // allow_sw fallback for some intel macs
EncoderVersion >= new Version(5, 1) ? "-fps_mode passthrough " : "-vsync passthrough ", // passthrough timestamp
"image2", "image2",
outputPath); outputPath);