lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed default framerate from hls

Browse Source
This commit is contained in:
Luke Pulverenti 2013-11-13 11:45:58 -05:00
parent e0f46bb91e
commit d60fca112b
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
View File

@ -142,29 +142,10 @@ namespace MediaBrowser.Api.Playback.Hls
args += GetOutputSizeParam(state, codec, performSubtitleConversion);
}
// Get the output framerate based on the FrameRate param
var framerate = state.VideoRequest.Framerate ?? 0;
// We have to supply a framerate for hls, so if it's null, account for that here
if (state.VideoStream != null)
if (state.VideoRequest.Framerate.HasValue)
{
if (framerate.Equals(0))
{
framerate = state.VideoStream.AverageFrameRate ?? 0;
}
if (framerate.Equals(0))
{
framerate = state.VideoStream.RealFrameRate ?? 0;
}
args += string.Format(" -r {0}", state.VideoRequest.Framerate.Value);
}
if (framerate.Equals(0))
{
framerate = 23.976;
}
framerate = Math.Round(framerate);
args += string.Format(" -r {0}", framerate);
args += " -vsync vfr";