diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-03-29 23:03:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-29 23:03:01 +0200 |
| commit | 5acd0521a26cbc89c66cc20cad3213b4d2a111ee (patch) | |
| tree | 7415530f8018f4878802808fd7eb6aa64dbf0d0b | |
| parent | bd4269cb5914bd9e90aaa508fa63f4d7e47e7397 (diff) | |
| parent | adbf375efe44a5866a277ff2d7720c0ced6597b2 (diff) | |
Merge pull request #2639 from alset333/master
Change DeinterlaceMethod's "bobandweave" to "yadif" or "yadif_bob", and set default value
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Configuration/EncodingOptions.cs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 342c76414..d056c1392 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -2005,7 +2005,7 @@ namespace MediaBrowser.Controller.MediaEncoding var inputFramerate = videoStream?.RealFrameRate; // If it is already 60fps then it will create an output framerate that is much too high for roku and others to handle - if (string.Equals(options.DeinterlaceMethod, "bobandweave", StringComparison.OrdinalIgnoreCase) && (inputFramerate ?? 60) <= 30) + if (string.Equals(options.DeinterlaceMethod, "yadif_bob", StringComparison.OrdinalIgnoreCase) && (inputFramerate ?? 60) <= 30) { filters.Add("yadif=1:-1:0"); } diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs index eaf9c4ecb..648568fd7 100644 --- a/MediaBrowser.Model/Configuration/EncodingOptions.cs +++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs @@ -40,6 +40,7 @@ namespace MediaBrowser.Model.Configuration VaapiDevice = "/dev/dri/renderD128"; H264Crf = 23; H265Crf = 28; + DeinterlaceMethod = "yadif"; EnableHardwareEncoding = true; EnableSubtitleExtraction = true; HardwareDecodingCodecs = new string[] { "h264", "vc1" }; |