Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

hlx fixes

Browse Source
This commit is contained in:
Luke Pulverenti 2013-08-29 21:25:37 -04:00
parent de8076f68c
commit 35d512e661
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
View File

@ -91,6 +91,15 @@ namespace MediaBrowser.Api.Playback.Hls
/// <returns>Task{System.Object}.</returns> /// <returns>Task{System.Object}.</returns>
public async Task<object> ProcessRequestAsync(StreamState state) public async Task<object> ProcessRequestAsync(StreamState state)
{ {
if (!state.VideoRequest.VideoBitRate.HasValue)
{
throw new ArgumentException("A video bitrate is required");
}
if (!state.Request.AudioBitRate.HasValue)
{
throw new ArgumentException("An audio bitrate is required");
}
var playlist = GetOutputFilePath(state); var playlist = GetOutputFilePath(state);
var isPlaylistNewlyCreated = false; var isPlaylistNewlyCreated = false;
@ -110,7 +119,7 @@ namespace MediaBrowser.Api.Playback.Hls
await WaitForMinimumSegmentCount(playlist, 3).ConfigureAwait(false); await WaitForMinimumSegmentCount(playlist, 3).ConfigureAwait(false);
} }
var playlistText = GetMasterPlaylistFileText(playlist, state.VideoRequest.VideoBitRate.Value); var playlistText = GetMasterPlaylistFileText(playlist, state.VideoRequest.VideoBitRate.Value + state.Request.AudioBitRate.Value);
try try
{ {
@ -234,8 +243,9 @@ namespace MediaBrowser.Api.Playback.Hls
{ {
var lowBitratePath = Path.Combine(Path.GetDirectoryName(outputPath), Path.GetFileNameWithoutExtension(outputPath) + "-low.m3u8"); var lowBitratePath = Path.Combine(Path.GetDirectoryName(outputPath), Path.GetFileNameWithoutExtension(outputPath) + "-low.m3u8");
var lowBitrateParams = string.Format(" -threads 0 -vn -codec:a:0 aac -strict experimental -ac 2 -ab 64000 -hls_time 10 -start_number 0 -hls_list_size 1440 \"{0}\"", var lowBitrateParams = string.Format(" -threads 0 -vn -codec:a:{1} aac -strict experimental -ac 2 -ab 64000 -hls_time 10 -start_number 0 -hls_list_size 1440 \"{0}\"",
lowBitratePath); lowBitratePath,
state.AudioStream.Index);
args += " " + lowBitrateParams; args += " " + lowBitrateParams;
} }