Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-31 04:05:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match the size of subtitle stream and video stream

Browse Source
This commit is contained in:
Nyanmisaka 2020-07-17 01:30:35 +08:00 committed by GitHub
parent 32fb34a4cc
commit c1c1a2f751
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1625,45 +1625,31 @@ namespace MediaBrowser.Controller.MediaEncoding
var videoSizeParam = string.Empty; var videoSizeParam = string.Empty;
var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, options) ?? string.Empty; var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, options) ?? string.Empty;
var isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
// Setup subtitle scaling // Setup subtitle scaling
if (state.VideoStream != null && state.VideoStream.Width.HasValue && state.VideoStream.Height.HasValue) if (state.VideoStream != null && state.VideoStream.Width.HasValue && state.VideoStream.Height.HasValue)
{ {
videoSizeParam = string.Format( // Adjust the size of graphical subtitles to fit the video stream.
var videoStream = state.VideoStream;
var inputWidth = videoStream?.Width;
var inputHeight = videoStream?.Height;
var (width, height) = GetFixedOutputSize(inputWidth, inputHeight, request.Width, request.Height, request.MaxWidth, request.MaxHeight);
if (width.HasValue && height.HasValue)
{
videoSizeParam = string.Format(
CultureInfo.InvariantCulture, CultureInfo.InvariantCulture,
"scale={0}x{1}", "scale={0}x{1}",
state.VideoStream.Width.Value, width.Value,
state.VideoStream.Height.Value); height.Value);
}
// For QSV, feed it into hardware encoder now // For QSV, feed it into hardware encoder now
var isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
if (!isWindows && string.Equals(outputVideoCodec, "h264_qsv", StringComparison.OrdinalIgnoreCase)) if (!isWindows && string.Equals(outputVideoCodec, "h264_qsv", StringComparison.OrdinalIgnoreCase))
{ {
videoSizeParam += ",hwupload=extra_hw_frames=64"; videoSizeParam += ",hwupload=extra_hw_frames=64";
} }
// For VAAPI and NVDEC decoder
// these encoders cannot automatically adjust the size of graphical subtitles to fit the output video,
// thus needs to be manually adjusted.
if (videoDecoder.IndexOf("cuvid", StringComparison.OrdinalIgnoreCase) != -1
|| (IsVaapiSupported(state) && string.Equals(options.HardwareAccelerationType, "vaapi", StringComparison.OrdinalIgnoreCase)
&& (videoDecoder.IndexOf("vaapi", StringComparison.OrdinalIgnoreCase) != -1
|| outputVideoCodec.IndexOf("vaapi", StringComparison.OrdinalIgnoreCase) != -1)))
{
var videoStream = state.VideoStream;
var inputWidth = videoStream?.Width;
var inputHeight = videoStream?.Height;
var (width, height) = GetFixedOutputSize(inputWidth, inputHeight, request.Width, request.Height, request.MaxWidth, request.MaxHeight);
if (width.HasValue && height.HasValue)
{
videoSizeParam = string.Format(
CultureInfo.InvariantCulture,
"scale={0}x{1}",
width.Value,
height.Value);
}
}
} }
var mapPrefix = state.SubtitleStream.IsExternal ? var mapPrefix = state.SubtitleStream.IsExternal ?
@ -1710,7 +1696,6 @@ namespace MediaBrowser.Controller.MediaEncoding
with fixed frame size. with fixed frame size.
Currently only supports linux. Currently only supports linux.
*/ */
var isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
if (!isWindows) if (!isWindows)
{ {
retStr = !string.IsNullOrEmpty(outputSizeParam) ? retStr = !string.IsNullOrEmpty(outputSizeParam) ?