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

Review suggestions

Browse Source
This commit is contained in:
Fernando Fernández 2020-11-18 10:54:21 +01:00
parent 38c3b6fcd3
commit 2deda0437d
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jellyfin.Api/Controllers/DynamicHlsController.cs
View File

@ -1329,7 +1329,7 @@ namespace Jellyfin.Api.Controllers
{ {
var videoCodec = _encodingHelper.GetVideoEncoder(state, encodingOptions); var videoCodec = _encodingHelper.GetVideoEncoder(state, encodingOptions);
var threads = EncodingHelper.GetNumberOfThreads(state, encodingOptions, videoCodec); // GetNumberOfThreads is static var threads = EncodingHelper.GetNumberOfThreads(state, encodingOptions, videoCodec); // GetNumberOfThreads is static.
if (state.BaseRequest.BreakOnNonKeyFrames) if (state.BaseRequest.BreakOnNonKeyFrames)
{ {

2
Jellyfin.Api/Controllers/VideoHlsController.cs
View File

@ -359,7 +359,7 @@ namespace Jellyfin.Api.Controllers
private string GetCommandLineArguments(string outputPath, StreamState state) private string GetCommandLineArguments(string outputPath, StreamState state)
{ {
var videoCodec = _encodingHelper.GetVideoEncoder(state, _encodingOptions); var videoCodec = _encodingHelper.GetVideoEncoder(state, _encodingOptions);
var threads = EncodingHelper.GetNumberOfThreads(state, _encodingOptions, videoCodec); // GetNumberOfThreads is static var threads = EncodingHelper.GetNumberOfThreads(state, _encodingOptions, videoCodec); // GetNumberOfThreads is static.
var inputModifier = _encodingHelper.GetInputModifier(state, _encodingOptions); var inputModifier = _encodingHelper.GetInputModifier(state, _encodingOptions);
var format = !string.IsNullOrWhiteSpace(state.Request.SegmentContainer) ? "." + state.Request.SegmentContainer : ".ts"; var format = !string.IsNullOrWhiteSpace(state.Request.SegmentContainer) ? "." + state.Request.SegmentContainer : ".ts";
var directory = Path.GetDirectoryName(outputPath) ?? throw new ArgumentException($"Provided path ({outputPath}) is not valid.", nameof(outputPath)); var directory = Path.GetDirectoryName(outputPath) ?? throw new ArgumentException($"Provided path ({outputPath}) is not valid.", nameof(outputPath));

8
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -2329,15 +2329,17 @@ namespace MediaBrowser.Controller.MediaEncoding
/// <summary> /// <summary>
/// Gets the number of threads. /// Gets the number of threads.
/// </summary> /// </summary>
public static int GetNumberOfThreads(EncodingJobInfo state, EncodingOptions encodingOptions, string outputVideoCodec) #nullable enable
public static int GetNumberOfThreads(EncodingJobInfo? state, EncodingOptions encodingOptions, string? outputVideoCodec)
{ {
if (outputVideoCodec != null && string.Equals(outputVideoCodec, "libvpx", StringComparison.OrdinalIgnoreCase)) if (string.Equals(outputVideoCodec, "libvpx", StringComparison.OrdinalIgnoreCase))
{ {
// per docs: // per docs:
// -threads number of threads to use for encoding, can't be 0 [auto] with VP8 // -threads number of threads to use for encoding, can't be 0 [auto] with VP8
// (recommended value : number of real cores - 1) // (recommended value : number of real cores - 1)
return Math.Max(Environment.ProcessorCount - 1, 1); return Math.Max(Environment.ProcessorCount - 1, 1);
} }
var threads = state?.BaseRequest.CpuCoreLimit ?? encodingOptions.EncodingThreadCount; var threads = state?.BaseRequest.CpuCoreLimit ?? encodingOptions.EncodingThreadCount;
// Automatic // Automatic
@ -2352,7 +2354,7 @@ namespace MediaBrowser.Controller.MediaEncoding
return threads; return threads;
} }
#nullable disable
public void TryStreamCopy(EncodingJobInfo state) public void TryStreamCopy(EncodingJobInfo state)
{ {
if (state.VideoStream != null && CanStreamCopyVideo(state, state.VideoStream)) if (state.VideoStream != null && CanStreamCopyVideo(state, state.VideoStream))