aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
diff options
context:
space:
mode:
authorPetr Janda <petr.janda@holidaysinhell.com>2019-12-06 05:52:40 +1030
committerPetr Janda <petr.janda@holidaysinhell.com>2019-12-06 05:52:40 +1030
commit9ee0804407d2a3cbcae913386f8799d938f6b7ed (patch)
tree0885bfe4f3d6536476643a25ffe1da72b2664725 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
parent7d2bfabb32a5876c977a2a9e4d4e196ee6ca73b2 (diff)
Move scaling filters and definitions before deinterlacing
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs11
1 files changed, 5 insertions, 6 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index ad5050471..480f33e43 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1978,12 +1978,6 @@ namespace MediaBrowser.Controller.MediaEncoding
filters.Add("hwupload=extra_hw_frames=64");
}
- var inputWidth = videoStream?.Width;
- var inputHeight = videoStream?.Height;
- var threeDFormat = state.MediaSource.Video3DFormat;
-
- filters.AddRange(GetScalingFilters(inputWidth, inputHeight, threeDFormat, videoDecoder, outputVideoCodec, request.Width, request.Height, request.MaxWidth, request.MaxHeight));
-
if (state.DeInterlace("h264", true)
&& string.Equals(outputVideoCodec, "h264_vaapi", StringComparison.OrdinalIgnoreCase))
{
@@ -2006,6 +2000,11 @@ namespace MediaBrowser.Controller.MediaEncoding
}
}
+ var inputWidth = videoStream?.Width;
+ var inputHeight = videoStream?.Height;
+ var threeDFormat = state.MediaSource.Video3DFormat;
+
+ filters.AddRange(GetScalingFilters(inputWidth, inputHeight, threeDFormat, videoDecoder, outputVideoCodec, request.Width, request.Height, request.MaxWidth, request.MaxHeight));
var output = string.Empty;