open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix SA1510

Browse Source
pull/3336/head
telans 5 years ago
parent 15aea76523
commit 726e116d5b
No known key found for this signature in database
GPG Key ID: 195444EE92DBCB20
7 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File

1
Emby.Dlna/Didl/DidlBuilder.cs
Unescape View File

@ -1139,7 +1139,6 @@ namespace Emby.Dlna.Didl
width = null; width = null;
height = null; height = null;
} }
else if (width == -1 || height == -1) else if (width == -1 || height == -1)
{ {
width = null; width = null;

1
Emby.Server.Implementations/Dto/DtoService.cs
Unescape View File

@ -406,7 +406,6 @@ namespace Emby.Server.Implementations.Dto
dto.DateLastMediaAdded = folder.DateLastMediaAdded; dto.DateLastMediaAdded = folder.DateLastMediaAdded;
} }
} }
else else
{ {
if (options.EnableUserData) if (options.EnableUserData)

1
Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
Unescape View File

@ -116,7 +116,6 @@ namespace Emby.Server.Implementations.HttpServer.Security
{ {
info.Device = tokenInfo.DeviceName; info.Device = tokenInfo.DeviceName;
} }
else if (!string.Equals(info.Device, tokenInfo.DeviceName, StringComparison.OrdinalIgnoreCase)) else if (!string.Equals(info.Device, tokenInfo.DeviceName, StringComparison.OrdinalIgnoreCase))
{ {
if (allowTokenInfoUpdate) if (allowTokenInfoUpdate)

3
Emby.Server.Implementations/Library/LiveStreamHelper.cs
Unescape View File

@ -148,17 +148,14 @@ namespace Emby.Server.Implementations.Library
{ {
videoStream.BitRate = 30000000; videoStream.BitRate = 30000000;
} }
else if (width >= 1900) else if (width >= 1900)
{ {
videoStream.BitRate = 20000000; videoStream.BitRate = 20000000;
} }
else if (width >= 1200) else if (width >= 1200)
{ {
videoStream.BitRate = 8000000; videoStream.BitRate = 8000000;
} }
else if (width >= 700) else if (width >= 700)
{ {
videoStream.BitRate = 2000000; videoStream.BitRate = 2000000;

3
Emby.Server.Implementations/Library/MediaSourceManager.cs
Unescape View File

@ -748,17 +748,14 @@ namespace Emby.Server.Implementations.Library
{ {
videoStream.BitRate = 30000000; videoStream.BitRate = 30000000;
} }
else if (width >= 1900) else if (width >= 1900)
{ {
videoStream.BitRate = 20000000; videoStream.BitRate = 20000000;
} }
else if (width >= 1200) else if (width >= 1200)
{ {
videoStream.BitRate = 8000000; videoStream.BitRate = 8000000;
} }
else if (width >= 700) else if (width >= 700)
{ {
videoStream.BitRate = 2000000; videoStream.BitRate = 2000000;

1
Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
Unescape View File

@ -56,7 +56,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
name += " " + info.EpisodeTitle; name += " " + info.EpisodeTitle;
} }
} }
else if (info.IsMovie && info.ProductionYear != null) else if (info.IsMovie && info.ProductionYear != null)
{ {
name += " (" + info.ProductionYear + ")"; name += " (" + info.ProductionYear + ")";

7
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
Unescape View File

@ -1327,7 +1327,6 @@ namespace MediaBrowser.Controller.MediaEncoding
// wmav2 currently only supports two channel output // wmav2 currently only supports two channel output
transcoderChannelLimit = 2; transcoderChannelLimit = 2;
} }
else if (codec.IndexOf("mp3", StringComparison.OrdinalIgnoreCase) != -1) else if (codec.IndexOf("mp3", StringComparison.OrdinalIgnoreCase) != -1)
{ {
// libmp3lame currently only supports two channel output // libmp3lame currently only supports two channel output
@ -1462,7 +1461,6 @@ namespace MediaBrowser.Controller.MediaEncoding
" -map 0:{0}", " -map 0:{0}",
state.AudioStream.Index); state.AudioStream.Index);
} }
else else
{ {
args += " -map -0:a"; args += " -map -0:a";
@ -1648,7 +1646,6 @@ namespace MediaBrowser.Controller.MediaEncoding
outputSizeParam = outputSizeParam.TrimStart(','); outputSizeParam = outputSizeParam.TrimStart(',');
retStr = " -filter_complex \"[{0}:{1}]{4}[sub];[0:{2}]{3}[base];[base][sub]overlay\""; retStr = " -filter_complex \"[{0}:{1}]{4}[sub];[0:{2}]{3}[base];[base][sub]overlay\"";
} }
else if (string.Equals(outputVideoCodec, "h264_qsv", StringComparison.OrdinalIgnoreCase)) else if (string.Equals(outputVideoCodec, "h264_qsv", StringComparison.OrdinalIgnoreCase))
{ {
/* /*
@ -2574,7 +2571,6 @@ namespace MediaBrowser.Controller.MediaEncoding
break; break;
} }
} }
else if (string.Equals(encodingOptions.HardwareAccelerationType, "nvenc", StringComparison.OrdinalIgnoreCase)) else if (string.Equals(encodingOptions.HardwareAccelerationType, "nvenc", StringComparison.OrdinalIgnoreCase))
{ {
switch (videoStream.Codec.ToLowerInvariant()) switch (videoStream.Codec.ToLowerInvariant())
@ -2619,7 +2615,6 @@ namespace MediaBrowser.Controller.MediaEncoding
break; break;
} }
} }
else if (string.Equals(encodingOptions.HardwareAccelerationType, "mediacodec", StringComparison.OrdinalIgnoreCase)) else if (string.Equals(encodingOptions.HardwareAccelerationType, "mediacodec", StringComparison.OrdinalIgnoreCase))
{ {
switch (videoStream.Codec.ToLowerInvariant()) switch (videoStream.Codec.ToLowerInvariant())
@ -2664,7 +2659,6 @@ namespace MediaBrowser.Controller.MediaEncoding
break; break;
} }
} }
else if (string.Equals(encodingOptions.HardwareAccelerationType, "omx", StringComparison.OrdinalIgnoreCase)) else if (string.Equals(encodingOptions.HardwareAccelerationType, "omx", StringComparison.OrdinalIgnoreCase))
{ {
switch (videoStream.Codec.ToLowerInvariant()) switch (videoStream.Codec.ToLowerInvariant())
@ -2696,7 +2690,6 @@ namespace MediaBrowser.Controller.MediaEncoding
break; break;
} }
} }
else if (string.Equals(encodingOptions.HardwareAccelerationType, "amf", StringComparison.OrdinalIgnoreCase)) else if (string.Equals(encodingOptions.HardwareAccelerationType, "amf", StringComparison.OrdinalIgnoreCase))
{ {
if (Environment.OSVersion.Platform == PlatformID.Win32NT) if (Environment.OSVersion.Platform == PlatformID.Win32NT)

Write Preview
Loading…
Cancel
Save