mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-08 12:28:19 +02:00
Fix formatting stuffed up by previous commit
This commit is contained in:
parent
89605d4fb1
commit
78a161138f
1 changed files with 49 additions and 42 deletions
|
@ -478,7 +478,9 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
if (!string.IsNullOrEmpty(videoDecoder) && videoDecoder.Contains("qsv"))
|
if (!string.IsNullOrEmpty(videoDecoder) && videoDecoder.Contains("qsv"))
|
||||||
{
|
{
|
||||||
arg.Append("-hwaccel qsv ");
|
arg.Append("-hwaccel qsv ");
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
arg.Append("-init_hw_device qsv=hw -filter_hw_device hw ");
|
arg.Append("-init_hw_device qsv=hw -filter_hw_device hw ");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1591,7 +1593,9 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
if (string.Equals(outputVideoCodec, "h264_qsv", StringComparison.OrdinalIgnoreCase))
|
if (string.Equals(outputVideoCodec, "h264_qsv", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
videoSizeParam += ",hwupload=extra_hw_frames=64";
|
videoSizeParam += ",hwupload=extra_hw_frames=64";
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
videoSizeParam += ":force_original_aspect_ratio=decrease";
|
videoSizeParam += ":force_original_aspect_ratio=decrease";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1605,7 +1609,6 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
: state.SubtitleStream.Index;
|
: state.SubtitleStream.Index;
|
||||||
|
|
||||||
var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, options);
|
var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, options);
|
||||||
|
|
||||||
var retStr = " -filter_complex \"[{0}:{1}]{4}[sub];[0:{2}][sub]overlay{3}\"";
|
var retStr = " -filter_complex \"[{0}:{1}]{4}[sub];[0:{2}][sub]overlay{3}\"";
|
||||||
|
|
||||||
if (string.Equals(outputVideoCodec, "h264_qsv", StringComparison.OrdinalIgnoreCase))
|
if (string.Equals(outputVideoCodec, "h264_qsv", StringComparison.OrdinalIgnoreCase))
|
||||||
|
@ -1613,7 +1616,9 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
if (!string.IsNullOrEmpty(videoDecoder) && videoDecoder.Contains("qsv"))
|
if (!string.IsNullOrEmpty(videoDecoder) && videoDecoder.Contains("qsv"))
|
||||||
{
|
{
|
||||||
retStr = " -filter_complex \"[{0}:{1}]{4}[sub];[0:{2}][sub]overlay_qsv=x=(W-w)/2:y=(H-h)/2{3}\"";
|
retStr = " -filter_complex \"[{0}:{1}]{4}[sub];[0:{2}][sub]overlay_qsv=x=(W-w)/2:y=(H-h)/2{3}\"";
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
retStr = " -filter_complex \"[{0}:{1}]{4}[sub];[0:{2}]hwupload=extra_hw_frames=64[v];[v][sub]overlay_qsv=x=(W-w)/2:y=(H-h)/2{3}\"";
|
retStr = " -filter_complex \"[{0}:{1}]{4}[sub];[0:{2}]hwupload=extra_hw_frames=64[v];[v][sub]overlay_qsv=x=(W-w)/2:y=(H-h)/2{3}\"";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1707,7 +1712,9 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
vaapi_or_qsv,
|
vaapi_or_qsv,
|
||||||
outputWidth,
|
outputWidth,
|
||||||
outputHeight));
|
outputHeight));
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
filters.Add(string.Format(CultureInfo.InvariantCulture, "scale_{0}=format=nv12", vaapi_or_qsv));
|
filters.Add(string.Format(CultureInfo.InvariantCulture, "scale_{0}=format=nv12", vaapi_or_qsv));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue