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

Comments

Browse Source
pull/2809/head
artiume 5 years ago committed by Vasily
parent 22ef0e3574
commit 0eb5791c70
1 changed files with 33 additions and 91 deletions
Show Stats Download Patch File Download Diff File

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

@ -73,7 +73,8 @@ namespace MediaBrowser.Controller.MediaEncoding
{"omx", hwEncoder + "_omx"},
{hwEncoder + "_v4l2m2m", hwEncoder + "_v4l2m2m"},
{"mediacodec", hwEncoder + "_mediacodec"},
{"vaapi", hwEncoder + "_vaapi"}
{"vaapi", hwEncoder + "_vaapi"},
{"videotoolbox", hwEncoder + "_videotoolbox"}
};
if (!string.IsNullOrEmpty(hwType)
@ -103,12 +104,8 @@ namespace MediaBrowser.Controller.MediaEncoding
return false;
}
if (!_mediaEncoder.SupportsHwaccel("vaapi"))
{
return false;
}
if _mediaEncoder.SupportsHwaccel("vaapi");
return true;
}
/// <summary>
@ -451,11 +448,15 @@ namespace MediaBrowser.Controller.MediaEncoding
var arg = new StringBuilder();
var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, encodingOptions);
var outputVideoCodec = GetVideoEncoder(state, encodingOptions);
bool isVaapiDecoder = (videoDecoder ?? string.Empty).IndexOf("vaapi", StringComparison.OrdinalIgnoreCase) != -1;
bool isVaapiEncoder = (outputVideoCodec ?? string.Empty).IndexOf("vaapi", StringComparison.OrdinalIgnoreCase) != -1;
bool isQsvDecoder = (videoDecoder ?? string.Empty).IndexOf("qsv", StringComparison.OrdinalIgnoreCase) != -1;
bool isQsvEncoder = (outputVideoCodec ?? string.Empty).IndexOf("qsv", StringComparison.OrdinalIgnoreCase) != -1;
if (state.IsVideoRequest && string.Equals(encodingOptions.HardwareAccelerationType, "vaapi", StringComparison.OrdinalIgnoreCase))
if (state.IsVideoRequest
&& string.Equals(encodingOptions.HardwareAccelerationType, "vaapi", StringComparison.OrdinalIgnoreCase))
{
// While using VAAPI decoder
if ((videoDecoder ?? string.Empty).IndexOf("vaapi", StringComparison.OrdinalIgnoreCase) != -1)
if (isVaapiDecoder)
{
arg.Append("-hwaccel_output_format vaapi ")
.Append("-vaapi_device ")
@ -463,8 +464,7 @@ namespace MediaBrowser.Controller.MediaEncoding
.Append(" ");
}
// While using SW decoder and VAAPI encoder
else if ((videoDecoder ?? string.Empty).IndexOf("vaapi", StringComparison.OrdinalIgnoreCase) == -1
&& (outputVideoCodec ?? string.Empty).IndexOf("vaapi", StringComparison.OrdinalIgnoreCase) != -1)
else if (!isVaapiDecoder && isVaapiEncoder)
{
arg.Append("-vaapi_device ")
.Append(encodingOptions.VaapiDevice)
@ -472,7 +472,8 @@ namespace MediaBrowser.Controller.MediaEncoding
}
}
if (state.IsVideoRequest && string.Equals(encodingOptions.HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase))
if (state.IsVideoRequest
&& string.Equals(encodingOptions.HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase))
{
var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, encodingOptions);
var outputVideoCodec = GetVideoEncoder(state, encodingOptions);
@ -481,11 +482,9 @@ namespace MediaBrowser.Controller.MediaEncoding
if (!hasTextSubs)
{
// While using QSV encoder
if ((outputVideoCodec ?? string.Empty).IndexOf("qsv", StringComparison.OrdinalIgnoreCase) != -1)
if (isQsvEncoder)
{
// While using QSV decoder
if ((videoDecoder ?? string.Empty).IndexOf("qsv", StringComparison.OrdinalIgnoreCase) != -1)
if (isQsvDecoder)
{
arg.Append("-hwaccel qsv ");
}
@ -543,6 +542,8 @@ namespace MediaBrowser.Controller.MediaEncoding
|| codec.IndexOf("hevc", StringComparison.OrdinalIgnoreCase) != -1;
}
// TODO This is auto inserted into the mpegts mux so it might not be needed
// https://www.ffmpeg.org/ffmpeg-bitstream-filters.html#h264_005fmp4toannexb
public string GetBitStreamArgs(MediaStream stream)
{
if (IsH264(stream))
@ -567,8 +568,8 @@ namespace MediaBrowser.Controller.MediaEncoding
{
if (string.Equals(videoCodec, "libvpx", StringComparison.OrdinalIgnoreCase))
{
// With vpx when crf is used, b:v becomes a max rate
// https://trac.ffmpeg.org/wiki/vpxEncodingGuide.
// When crf is used with vpx, b:v becomes a max rate
// https://trac.ffmpeg.org/wiki/Encode/VP9
return string.Format(
CultureInfo.InvariantCulture,
" -maxrate:v {0} -bufsize:v {1} -b:v {0}",
@ -2579,17 +2580,8 @@ namespace MediaBrowser.Controller.MediaEncoding
case "h265":
if (_mediaEncoder.SupportsDecoder("hevc_qsv") && encodingOptions.HardwareDecodingCodecs.Contains("hevc", StringComparer.OrdinalIgnoreCase))
{
if (isColorDepth10)
{
if (encodingOptions.EnableDecodingColorDepth10)
{
return "-c:v hevc_qsv";
}
return null;
}
return "-c:v hevc_qsv";
return (isColorDepth10 &&
!encodingOptions.EnableDecodingColorDepth10) ? null : "-c:v hevc_qsv";
}
break;
case "mpeg2video":
@ -2613,17 +2605,8 @@ namespace MediaBrowser.Controller.MediaEncoding
case "vp9":
if (_mediaEncoder.SupportsDecoder("vp9_qsv") && encodingOptions.HardwareDecodingCodecs.Contains("vp9", StringComparer.OrdinalIgnoreCase))
{
if (isColorDepth10)
{
if (encodingOptions.EnableDecodingColorDepth10)
{
return "-c:v vp9_qsv";
}
return null;
}
return "-c:v vp9_qsv";
return (isColorDepth10 &&
!encodingOptions.EnableDecodingColorDepth10) ? null : "-c:v vp9_qsv";
}
break;
}
@ -2637,30 +2620,16 @@ namespace MediaBrowser.Controller.MediaEncoding
case "h264":
if (_mediaEncoder.SupportsDecoder("h264_cuvid") && encodingOptions.HardwareDecodingCodecs.Contains("h264", StringComparer.OrdinalIgnoreCase))
{
// cuvid decoder does not support 10-bit input
if ((videoStream.BitDepth ?? 8) > 8)
{
encodingOptions.HardwareDecodingCodecs = Array.Empty<string>();
return null;
}
return "-c:v h264_cuvid";
return (isColorDepth10 &&
!encodingOptions.EnableDecodingColorDepth10) ? null : "-c:v h264_cuvid";
}
break;
case "hevc":
case "h265":
if (_mediaEncoder.SupportsDecoder("hevc_cuvid") && encodingOptions.HardwareDecodingCodecs.Contains("hevc", StringComparer.OrdinalIgnoreCase))
{
if (isColorDepth10)
{
if (encodingOptions.EnableDecodingColorDepth10)
{
return "-c:v hevc_cuvid";
}
return null;
}
return "-c:v hevc_cuvid";
return (isColorDepth10 &&
!encodingOptions.EnableDecodingColorDepth10) ? null : "-c:v hevc_cuvid";
}
break;
case "mpeg2video":
@ -2690,17 +2659,8 @@ namespace MediaBrowser.Controller.MediaEncoding
case "vp9":
if (_mediaEncoder.SupportsDecoder("vp9_cuvid") && encodingOptions.HardwareDecodingCodecs.Contains("vp9", StringComparer.OrdinalIgnoreCase))
{
if (isColorDepth10)
{
if (encodingOptions.EnableDecodingColorDepth10)
{
return "-c:v vp9_cuvid";
}
return null;
}
return "-c:v vp9_cuvid";
return (isColorDepth10 &&
!encodingOptions.EnableDecodingColorDepth10) ? null : "-c:v vp9_cuvid";
}
break;
}
@ -2721,17 +2681,8 @@ namespace MediaBrowser.Controller.MediaEncoding
case "h265":
if (_mediaEncoder.SupportsDecoder("hevc_mediacodec") && encodingOptions.HardwareDecodingCodecs.Contains("hevc", StringComparer.OrdinalIgnoreCase))
{
if (isColorDepth10)
{
if (encodingOptions.EnableDecodingColorDepth10)
{
return "-c:v hevc_mediacodec";
}
return null;
}
return "-c:v hevc_mediacodec";
return (isColorDepth10 &&
!encodingOptions.EnableDecodingColorDepth10) ? null : "-c:v hevc_mediacodec";
}
break;
case "mpeg2video":
@ -2755,17 +2706,8 @@ namespace MediaBrowser.Controller.MediaEncoding
case "vp9":
if (_mediaEncoder.SupportsDecoder("vp9_mediacodec") && encodingOptions.HardwareDecodingCodecs.Contains("vp9", StringComparer.OrdinalIgnoreCase))
{
if (isColorDepth10)
{
if (encodingOptions.EnableDecodingColorDepth10)
{
return "-c:v vp9_mediacodec";
}
return null;
}
return "-c:v vp9_mediacodec";
return (isColorDepth10 &&
!encodingOptions.EnableDecodingColorDepth10) ? null : "-c:v vp9_mediacodec";
}
break;
}

Write Preview
Loading…
Cancel
Save