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

Apply suggestions from code review

Browse Source 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
This commit is contained in:
Nyanmisaka 2021-02-08 16:41:38 +08:00 committed by GitHub
parent 3052068161
commit 22e8667105
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2234,8 +2234,8 @@ namespace MediaBrowser.Controller.MediaEncoding
} }
} }
else if ((videoDecoder ?? string.Empty).Contains("cuda", StringComparison.OrdinalIgnoreCase) else if ((videoDecoder ?? string.Empty).Contains("cuda", StringComparison.OrdinalIgnoreCase)
&& width.HasValue && width.HasValue
&& height.HasValue) && height.HasValue)
{ {
var outputWidth = width.Value; var outputWidth = width.Value;
var outputHeight = height.Value; var outputHeight = height.Value;
@ -2667,14 +2667,14 @@ namespace MediaBrowser.Controller.MediaEncoding
// When burning in graphical subtitles using overlay_qsv, upload videostream to the same qsv context. // When burning in graphical subtitles using overlay_qsv, upload videostream to the same qsv context.
else if (isLinux && hasGraphicalSubs && (isQsvH264Encoder || isQsvHevcEncoder) else if (isLinux && hasGraphicalSubs && (isQsvH264Encoder || isQsvHevcEncoder)
&& !(isTonemappingSupportedOnQsv && isVppTonemappingSupported)) && !(isTonemappingSupportedOnQsv && isVppTonemappingSupported))
{ {
filters.Add("hwupload=extra_hw_frames=64"); filters.Add("hwupload=extra_hw_frames=64");
} }
// If we're hardware VAAPI decoding and software encoding, download frames from the decoder first. // If we're hardware VAAPI decoding and software encoding, download frames from the decoder first.
else if ((IsVaapiSupported(state) && isVaapiDecoder) && (isLibX264Encoder || isLibX265Encoder) else if ((IsVaapiSupported(state) && isVaapiDecoder) && (isLibX264Encoder || isLibX265Encoder)
&& !(isTonemappingSupportedOnQsv && isVppTonemappingSupported)) && !(isTonemappingSupportedOnQsv && isVppTonemappingSupported))
{ {
var codec = videoStream.Codec; var codec = videoStream.Codec;