starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-24 09:44:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

better bitrate syncing

Browse Source
This commit is contained in:
Luke Pulverenti
2013-08-29 22:13:58 -04:00
parent 87c4d447f8
commit a5fa31cf94
5 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,9 +146,11 @@ namespace MediaBrowser.Api.Playback.Hls
args += " -ar " + state.Request.AudioSampleRate.Value;
}
if (state.Request.AudioBitRate.HasValue)
var bitrate = GetAudioBitrateParam(state);
if (bitrate.HasValue)
{
args += " -ab " + state.Request.AudioBitRate.Value;
args += " -ab " + bitrate.Value.ToString(UsCulture);
}
var volParam = string.Empty;
@@ -187,14 +189,11 @@ namespace MediaBrowser.Api.Playback.Hls
var args = "-codec:v:0 " + codec + " -preset superfast" + keyFrameArg;
if (state.VideoRequest.VideoBitRate.HasValue)
var bitrate = GetVideoBitrateParam(state);
if (bitrate.HasValue)
{
// Make sure we don't request a bitrate higher than the source
var currentBitrate = state.VideoStream == null ? state.VideoRequest.VideoBitRate.Value : state.VideoStream.BitRate ?? state.VideoRequest.VideoBitRate.Value;
var bitrate = Math.Min(currentBitrate, state.VideoRequest.VideoBitRate.Value);
args += string.Format(" -b:v {0}", bitrate);
args += string.Format(" -b:v {0}", bitrate.Value.ToString(UsCulture));
}
// Add resolution params, if specified