alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-01 07:51:54 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

update deinterlace param

Browse Source
This commit is contained in:
Luke Pulverenti
2017-09-27 10:52:01 -04:00
parent f1371b17d8
commit f55b138e1d
5 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -799,13 +799,12 @@ namespace MediaBrowser.Controller.MediaEncoding
if (videoStream.IsInterlaced)
{
if (state.DeInterlace(videoStream.Codec))
if (state.DeInterlace(videoStream.Codec, false))
{
return false;
}
}
if (videoStream.IsAnamorphic ?? false)
{
if (request.RequireNonAnamorphic)
@@ -1365,7 +1364,7 @@ namespace MediaBrowser.Controller.MediaEncoding
filters.Add("hwupload");
}
if (state.DeInterlace("h264") && !string.Equals(outputVideoCodec, "h264_vaapi", StringComparison.OrdinalIgnoreCase))
if (state.DeInterlace("h264", true) && !string.Equals(outputVideoCodec, "h264_vaapi", StringComparison.OrdinalIgnoreCase))
{
// 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) && (state.VideoStream.RealFrameRate ?? 60) <= 30)

13
MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
View File

@@ -161,7 +161,7 @@ namespace MediaBrowser.Controller.MediaEncoding
public int? OutputAudioBitrate;
public int? OutputAudioChannels;
public bool DeInterlace(string videoCodec)
public bool DeInterlace(string videoCodec, bool forceDeinterlaceIfSourceIsInterlaced)
{
// Support general param
if (BaseRequest.DeInterlace)
@@ -177,6 +177,15 @@ namespace MediaBrowser.Controller.MediaEncoding
}
}
if (forceDeinterlaceIfSourceIsInterlaced)
{
var videoStream = VideoStream;
if (videoStream != null && videoStream.IsInterlaced)
{
return true;
}
}
return false;
}
@@ -559,7 +568,7 @@ namespace MediaBrowser.Controller.MediaEncoding
return VideoStream == null ? (bool?)null : VideoStream.IsInterlaced;
}
if (DeInterlace(ActualOutputVideoCodec))
if (DeInterlace(ActualOutputVideoCodec, true))
{
return false;
}