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

minor changes

Browse Source
pull/2809/head
Nyanmisaka 5 years ago committed by Vasily
parent c4ba71d96a
commit 161b2a2da9
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File

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

@ -457,8 +457,8 @@ namespace MediaBrowser.Controller.MediaEncoding
// While using VAAPI decoder // While using VAAPI decoder
if ((videoDecoder ?? string.Empty).IndexOf("vaapi", StringComparison.OrdinalIgnoreCase) != -1) if ((videoDecoder ?? string.Empty).IndexOf("vaapi", StringComparison.OrdinalIgnoreCase) != -1)
{ {
arg.Append("-hwaccel_output_format vaapi") arg.Append("-hwaccel_output_format vaapi ")
.Append(" -vaapi_device ") .Append("-vaapi_device ")
.Append(encodingOptions.VaapiDevice) .Append(encodingOptions.VaapiDevice)
.Append(" "); .Append(" ");
} }
@ -1610,8 +1610,10 @@ namespace MediaBrowser.Controller.MediaEncoding
// For VAAPI and CUVID decoder // For VAAPI and CUVID decoder
// these encoders cannot automatically adjust the size of graphical subtitles to fit the output video, // these encoders cannot automatically adjust the size of graphical subtitles to fit the output video,
// thus needs to be manually adjusted. // thus needs to be manually adjusted.
if ((IsVaapiSupported(state) && string.Equals(options.HardwareAccelerationType, "vaapi", StringComparison.OrdinalIgnoreCase)) if ((videoDecoder ?? string.Empty).IndexOf("cuvid", StringComparison.OrdinalIgnoreCase) != -1
|| (videoDecoder ?? string.Empty).IndexOf("cuvid", StringComparison.OrdinalIgnoreCase) != -1) || (IsVaapiSupported(state) && string.Equals(options.HardwareAccelerationType, "vaapi", StringComparison.OrdinalIgnoreCase)
&& ((videoDecoder ?? string.Empty).IndexOf("vaapi", StringComparison.OrdinalIgnoreCase) != -1
|| (outputVideoCodec ?? string.Empty).IndexOf("vaapi", StringComparison.OrdinalIgnoreCase) != -1)))
{ {
var videoStream = state.VideoStream; var videoStream = state.VideoStream;
var inputWidth = videoStream?.Width; var inputWidth = videoStream?.Width;
@ -1653,7 +1655,7 @@ namespace MediaBrowser.Controller.MediaEncoding
} }
// 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) && string.Equals(options.HardwareAccelerationType, "vaapi", StringComparison.OrdinalIgnoreCase) else if (IsVaapiSupported(state) && (videoDecoder ?? string.Empty).IndexOf("vaapi", StringComparison.OrdinalIgnoreCase) != -1
&& string.Equals(outputVideoCodec, "libx264", StringComparison.OrdinalIgnoreCase)) && string.Equals(outputVideoCodec, "libx264", StringComparison.OrdinalIgnoreCase))
{ {
/* /*
@ -2582,13 +2584,13 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
if (encodingOptions.EnableDecodingColorDepth10) if (encodingOptions.EnableDecodingColorDepth10)
{ {
return "-c:v hevc_qsv "; return "-c:v hevc_qsv";
} }
return null; return null;
} }
return "-c:v hevc_qsv "; return "-c:v hevc_qsv";
} }
break; break;
case "mpeg2video": case "mpeg2video":
@ -2606,7 +2608,7 @@ namespace MediaBrowser.Controller.MediaEncoding
case "vp8": case "vp8":
if (_mediaEncoder.SupportsDecoder("vp8_qsv") && encodingOptions.HardwareDecodingCodecs.Contains("vp8", StringComparer.OrdinalIgnoreCase)) if (_mediaEncoder.SupportsDecoder("vp8_qsv") && encodingOptions.HardwareDecodingCodecs.Contains("vp8", StringComparer.OrdinalIgnoreCase))
{ {
return "-c:v vp8_qsv "; return "-c:v vp8_qsv";
} }
break; break;
case "vp9": case "vp9":
@ -2616,13 +2618,13 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
if (encodingOptions.EnableDecodingColorDepth10) if (encodingOptions.EnableDecodingColorDepth10)
{ {
return "-c:v vp9_qsv "; return "-c:v vp9_qsv";
} }
return null; return null;
} }
return "-c:v vp9_qsv "; return "-c:v vp9_qsv";
} }
break; break;
} }
@ -2653,13 +2655,13 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
if (encodingOptions.EnableDecodingColorDepth10) if (encodingOptions.EnableDecodingColorDepth10)
{ {
return "-c:v hevc_cuvid "; return "-c:v hevc_cuvid";
} }
return null; return null;
} }
return "-c:v hevc_cuvid "; return "-c:v hevc_cuvid";
} }
break; break;
case "mpeg2video": case "mpeg2video":
@ -2683,7 +2685,7 @@ namespace MediaBrowser.Controller.MediaEncoding
case "vp8": case "vp8":
if (_mediaEncoder.SupportsDecoder("vp8_cuvid") && encodingOptions.HardwareDecodingCodecs.Contains("vp8", StringComparer.OrdinalIgnoreCase)) if (_mediaEncoder.SupportsDecoder("vp8_cuvid") && encodingOptions.HardwareDecodingCodecs.Contains("vp8", StringComparer.OrdinalIgnoreCase))
{ {
return "-c:v vp8_cuvid "; return "-c:v vp8_cuvid";
} }
break; break;
case "vp9": case "vp9":
@ -2693,13 +2695,13 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
if (encodingOptions.EnableDecodingColorDepth10) if (encodingOptions.EnableDecodingColorDepth10)
{ {
return "-c:v vp9_cuvid "; return "-c:v vp9_cuvid";
} }
return null; return null;
} }
return "-c:v vp9_cuvid "; return "-c:v vp9_cuvid";
} }
break; break;
} }
@ -2724,13 +2726,13 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
if (encodingOptions.EnableDecodingColorDepth10) if (encodingOptions.EnableDecodingColorDepth10)
{ {
return "-c:v hevc_mediacodec "; return "-c:v hevc_mediacodec";
} }
return null; return null;
} }
return "-c:v hevc_mediacodec "; return "-c:v hevc_mediacodec";
} }
break; break;
case "mpeg2video": case "mpeg2video":
@ -2758,13 +2760,13 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
if (encodingOptions.EnableDecodingColorDepth10) if (encodingOptions.EnableDecodingColorDepth10)
{ {
return "-c:v vp9_mediacodec "; return "-c:v vp9_mediacodec";
} }
return null; return null;
} }
return "-c:v vp9_mediacodec "; return "-c:v vp9_mediacodec";
} }
break; break;
} }
@ -2916,15 +2918,15 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
if (!IsWindows) if (!IsWindows)
{ {
return "-hwaccel vaapi "; return "-hwaccel vaapi";
} }
else if (IsWindows && IsNewWindows) else if (IsWindows && IsNewWindows)
{ {
return "-hwaccel d3d11va "; return "-hwaccel d3d11va";
} }
else if (IsWindows && !IsNewWindows) else if (IsWindows && !IsNewWindows)
{ {
return "-hwaccel dxva2 "; return "-hwaccel dxva2";
} }
} }

Write Preview
Loading…
Cancel
Save