aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs13
1 files changed, 11 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index 450bbf7c1..cf067ddf4 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -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;
}