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

comply with dotnet-5

Browse Source
This commit is contained in:
nyanmisaka 2020-11-16 12:56:37 +08:00
parent 488dbdb31d
commit 099563cd6b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jellyfin.Api/Helpers/DynamicHlsHelper.cs
View File

@ -515,7 +515,7 @@ namespace Jellyfin.Api.Helpers
&& state.VideoStream != null && state.VideoStream != null
&& state.VideoStream.Level.HasValue) && state.VideoStream.Level.HasValue)
{ {
levelString = state.VideoStream.Level.ToString(); levelString = state.VideoStream.Level.ToString() ?? string.Empty;
} }
else else
{ {
@ -557,7 +557,7 @@ namespace Jellyfin.Api.Helpers
} }
else if (!string.IsNullOrEmpty(codec)) else if (!string.IsNullOrEmpty(codec))
{ {
profileString = state.GetRequestedProfiles(codec).FirstOrDefault(); profileString = state.GetRequestedProfiles(codec).FirstOrDefault() ?? string.Empty;
if (string.Equals(state.ActualOutputVideoCodec, "h264", StringComparison.OrdinalIgnoreCase)) if (string.Equals(state.ActualOutputVideoCodec, "h264", StringComparison.OrdinalIgnoreCase))
{ {
profileString = profileString ?? "high"; profileString = profileString ?? "high";

3
Jellyfin.Api/Helpers/HlsHelpers.cs
View File

@ -100,8 +100,9 @@ namespace Jellyfin.Api.Helpers
/// <returns>The string text of #EXT-X-MAP.</returns> /// <returns>The string text of #EXT-X-MAP.</returns>
public static string GetFmp4InitFileName(string outputPath, StreamState state, bool isOsDepends) public static string GetFmp4InitFileName(string outputPath, StreamState state, bool isOsDepends)
{ {
var directory = Path.GetDirectoryName(outputPath) ?? throw new ArgumentException($"Provided path ({outputPath}) is not valid.", nameof(outputPath));
var outputFileNameWithoutExtension = Path.GetFileNameWithoutExtension(outputPath); var outputFileNameWithoutExtension = Path.GetFileNameWithoutExtension(outputPath);
var outputPrefix = Path.Combine(Path.GetDirectoryName(outputPath), outputFileNameWithoutExtension); var outputPrefix = Path.Combine(directory, outputFileNameWithoutExtension);
var outputExtension = GetSegmentFileExtension(state.Request.SegmentContainer); var outputExtension = GetSegmentFileExtension(state.Request.SegmentContainer);
// on Linux/Unix // on Linux/Unix