michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11511 from jellyfin/trickplay-keyframe-only

Browse Source
This commit is contained in:
Cody Robibero 2024-07-17 12:28:58 -04:00 committed by GitHub
commit c207404089
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
View File

@ -168,6 +168,7 @@ public class TrickplayManager : ITrickplayManager
options.ProcessThreads, options.ProcessThreads,
options.Qscale, options.Qscale,
options.ProcessPriority, options.ProcessPriority,
options.EnableKeyFrameOnlyExtraction,
_encodingHelper, _encodingHelper,
cancellationToken).ConfigureAwait(false); cancellationToken).ConfigureAwait(false);

2
MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
View File

@ -153,6 +153,7 @@ namespace MediaBrowser.Controller.MediaEncoding
/// <param name="threads">The input/output thread count for ffmpeg.</param> /// <param name="threads">The input/output thread count for ffmpeg.</param>
/// <param name="qualityScale">The qscale value for ffmpeg.</param> /// <param name="qualityScale">The qscale value for ffmpeg.</param>
/// <param name="priority">The process priority for the ffmpeg process.</param> /// <param name="priority">The process priority for the ffmpeg process.</param>
/// <param name="enableKeyFrameOnlyExtraction">Whether to only extract key frames.</param>
/// <param name="encodingHelper">EncodingHelper instance.</param> /// <param name="encodingHelper">EncodingHelper instance.</param>
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Directory where images where extracted. A given image made before another will always be named with a lower number.</returns> /// <returns>Directory where images where extracted. A given image made before another will always be named with a lower number.</returns>
@ -168,6 +169,7 @@ namespace MediaBrowser.Controller.MediaEncoding
int? threads, int? threads,
int? qualityScale, int? qualityScale,
ProcessPriorityClass? priority, ProcessPriorityClass? priority,
bool enableKeyFrameOnlyExtraction,
EncodingHelper encodingHelper, EncodingHelper encodingHelper,
CancellationToken cancellationToken); CancellationToken cancellationToken);

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

@ -813,12 +813,28 @@ namespace MediaBrowser.MediaEncoding.Encoder
int? threads, int? threads,
int? qualityScale, int? qualityScale,
ProcessPriorityClass? priority, ProcessPriorityClass? priority,
bool enableKeyFrameOnlyExtraction,
EncodingHelper encodingHelper, EncodingHelper encodingHelper,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
var options = allowHwAccel ? _configurationManager.GetEncodingOptions() : new EncodingOptions(); var options = allowHwAccel ? _configurationManager.GetEncodingOptions() : new EncodingOptions();
threads ??= _threads; threads ??= _threads;
if (allowHwAccel && enableKeyFrameOnlyExtraction)
{
var supportsKeyFrameOnly = (string.Equals(options.HardwareAccelerationType, "nvenc", StringComparison.OrdinalIgnoreCase) && options.EnableEnhancedNvdecDecoder)
|| (string.Equals(options.HardwareAccelerationType, "amf", StringComparison.OrdinalIgnoreCase) && OperatingSystem.IsWindows())
|| (string.Equals(options.HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase) && options.PreferSystemNativeHwDecoder)
|| string.Equals(options.HardwareAccelerationType, "vaapi", StringComparison.OrdinalIgnoreCase)
|| string.Equals(options.HardwareAccelerationType, "videotoolbox", StringComparison.OrdinalIgnoreCase);
if (!supportsKeyFrameOnly)
{
// Disable hardware acceleration when the hardware decoder does not support keyframe only mode.
allowHwAccel = false;
options = new EncodingOptions();
}
}
// A new EncodingOptions instance must be used as to not disable HW acceleration for all of Jellyfin. // A new EncodingOptions instance must be used as to not disable HW acceleration for all of Jellyfin.
// Additionally, we must set a few fields without defaults to prevent null pointer exceptions. // Additionally, we must set a few fields without defaults to prevent null pointer exceptions.
if (!allowHwAccel) if (!allowHwAccel)
@ -868,6 +884,11 @@ 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
} }
if (enableKeyFrameOnlyExtraction)
{
inputArg = "-skip_frame nokey " + inputArg;
}
var filterParam = encodingHelper.GetVideoProcessingFilterParam(jobState, options, vidEncoder).Trim(); var filterParam = encodingHelper.GetVideoProcessingFilterParam(jobState, options, vidEncoder).Trim();
if (string.IsNullOrWhiteSpace(filterParam)) if (string.IsNullOrWhiteSpace(filterParam))
{ {

6
MediaBrowser.Model/Configuration/TrickplayOptions.cs
View File

@ -18,6 +18,12 @@ public class TrickplayOptions
/// </summary> /// </summary>
public bool EnableHwEncoding { get; set; } = false; public bool EnableHwEncoding { get; set; } = false;
/// <summary>
/// Gets or sets a value indicating whether to only extract key frames.
/// Significantly faster, but is not compatible with all decoders and/or video files.
/// </summary>
public bool EnableKeyFrameOnlyExtraction { get; set; } = false;
/// <summary> /// <summary>
/// Gets or sets the behavior used by trickplay provider on library scan/update. /// Gets or sets the behavior used by trickplay provider on library scan/update.
/// </summary> /// </summary>