aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-09-06 16:51:43 -0400
committerGitHub <noreply@github.com>2017-09-06 16:51:43 -0400
commitab3e79e6aaa5bf90c90578f514e5ab26def9cb0e (patch)
treebfdcdca3260cb69ef1ed3a9cf5e04765c4136941 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
parent49b799adbe3d65973b136bee758584748ecf6c2a (diff)
parent6c9274730bd2c024e96abfa32b97e0bd5ccda8d7 (diff)
Merge pull request #2781 from puenktchen/patch-2
Improve playback of RTSP streams
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 736f1b32f..531711b55 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1567,6 +1567,11 @@ namespace MediaBrowser.Controller.MediaEncoding
inputModifier += " " + GetFastSeekCommandLineParameter(state.BaseRequest);
inputModifier = inputModifier.Trim();
+
+ if (state.InputProtocol == MediaProtocol.Rtsp)
+ {
+ inputModifier += " -rtsp_transport tcp";
+ }
if (!string.IsNullOrEmpty(state.InputAudioSync))
{
@@ -1578,7 +1583,7 @@ namespace MediaBrowser.Controller.MediaEncoding
inputModifier += " -vsync " + state.InputVideoSync;
}
- if (state.ReadInputAtNativeFramerate)
+ if (state.ReadInputAtNativeFramerate && state.InputProtocol != MediaProtocol.Rtsp)
{
inputModifier += " -re";
}