CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-04 15:28:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #5223 from Bond-009/minor10

Browse source 
Minor improvements
This commit is contained in:
dkanada 2021-02-20 10:56:55 +09:00 • committed by GitHub
commit 13d65318eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 78 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

13
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View file

@ -598,7 +598,7 @@ namespace MediaBrowser.Controller.MediaEncoding
if (state.IsVideoRequest
&& ((string.Equals(encodingOptions.HardwareAccelerationType, "nvenc", StringComparison.OrdinalIgnoreCase)
&& (isNvdecDecoder || isCuvidHevcDecoder || isSwDecoder))
|| (string.Equals(encodingOptions.HardwareAccelerationType, "amf", StringComparison.OrdinalIgnoreCase)
|| (string.Equals(encodingOptions.HardwareAccelerationType, "amf", StringComparison.OrdinalIgnoreCase)
&& (isD3d11vaDecoder || isSwDecoder))))
{
if (isTonemappingSupported)
@ -1387,7 +1387,8 @@ namespace MediaBrowser.Controller.MediaEncoding
var requestedProfile = requestedProfiles[0];
// strip spaces because they may be stripped out on the query string as well
if (!string.IsNullOrEmpty(videoStream.Profile) && !requestedProfiles.Contains(videoStream.Profile.Replace(" ", ""), StringComparer.OrdinalIgnoreCase))
if (!string.IsNullOrEmpty(videoStream.Profile)
&& !requestedProfiles.Contains(videoStream.Profile.Replace(" ", "", StringComparison.Ordinal), StringComparer.OrdinalIgnoreCase))
{
var currentScore = GetVideoProfileScore(videoStream.Profile);
var requestedScore = GetVideoProfileScore(requestedProfile);
@ -1716,7 +1717,7 @@ namespace MediaBrowser.Controller.MediaEncoding
if (filters.Count > 0)
{
return " -af \"" + string.Join(",", filters) + "\"";
return " -af \"" + string.Join(',', filters) + "\"";
}
return string.Empty;
@ -2894,7 +2895,7 @@ namespace MediaBrowser.Controller.MediaEncoding
output += string.Format(
CultureInfo.InvariantCulture,
"{0}",
string.Join(",", filters));
string.Join(',', filters));
}
return output;
@ -2920,7 +2921,7 @@ namespace MediaBrowser.Controller.MediaEncoding
if (threads <= 0)
{
return 0;
}
}
else if (threads >= Environment.ProcessorCount)
{
return Environment.ProcessorCount;
@ -3870,7 +3871,7 @@ namespace MediaBrowser.Controller.MediaEncoding
GetInputArgument(state, encodingOptions),
threads,
" -vn",
string.Join(" ", audioTranscodeParams),
string.Join(' ', audioTranscodeParams),
outputPath,
string.Empty,
string.Empty,