lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix outputSize

Browse Source
This commit is contained in:
nyanmisaka 2020-08-20 19:08:36 +08:00
parent c23d991c95
commit 54349fc945
1 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1639,35 +1639,45 @@ namespace MediaBrowser.Controller.MediaEncoding
var outputSizeParam = ReadOnlySpan<char>.Empty; var outputSizeParam = ReadOnlySpan<char>.Empty;
var request = state.BaseRequest; var request = state.BaseRequest;
// Add resolution params, if specified outputSizeParam = GetOutputSizeParam(state, options, outputVideoCodec).TrimEnd('"');
if (request.Width.HasValue
|| request.Height.HasValue // All possible beginning of video filters
|| request.MaxHeight.HasValue // Don't break the order
|| request.MaxWidth.HasValue) string[] beginOfOutputSizeParam = new[]
{ {
outputSizeParam = GetOutputSizeParam(state, options, outputVideoCodec).TrimEnd('"'); // for tonemap_opencl
"hwupload,tonemap_opencl",
// All possible beginning of video filters // hwupload=extra_hw_frames=64,vpp_qsv (for overlay_qsv on linux)
// Don't break the order "hwupload=extra_hw_frames",
string[] beginOfParam = new[]
{
"hwupload,tonemap_opencl",
"hwupload=extra_hw_frames",
"vpp",
"hwdownload",
"format",
"yadif",
"scale"
};
for (int i = 0, index = -1; i < beginOfParam.Length; i++) // vpp_qsv
"vpp",
// hwdownload,format=p010le (hardware decode + software encode for vaapi)
"hwdownload",
// format=nv12|vaapi,hwupload,scale_vaapi
"format",
// bwdif,scale=expr
"bwdif",
// yadif,scale=expr
"yadif",
// scale=expr
"scale"
};
var index = -1;
foreach (var param in beginOfOutputSizeParam)
{
index = outputSizeParam.IndexOf(param, StringComparison.OrdinalIgnoreCase);
if (index != -1)
{ {
index = outputSizeParam.IndexOf(beginOfParam[i], StringComparison.OrdinalIgnoreCase); outputSizeParam = outputSizeParam.Slice(index);
if (index != -1) break;
{
outputSizeParam = outputSizeParam.Slice(index);
break;
}
} }
} }