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

added new device profiles

Browse Source
This commit is contained in:
Luke Pulverenti
2014-07-16 23:17:14 -04:00
parent 21c3430ac4
commit e2052c771d
94 changed files with 3031 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@@ -607,7 +607,7 @@ namespace MediaBrowser.Api.Playback
}
}
// TODO: Perhaps also use original_size=1920x800
// TODO: Perhaps also use original_size=1920x800 ??
return string.Format("subtitles=filename='{0}'{1},setpts=PTS -{2}/TB",
subtitlePath.Replace('\\', '/').Replace(":/", "\\:/"),
charsetParam,
@@ -817,7 +817,7 @@ namespace MediaBrowser.Api.Playback
state.MediaPath = streamInfo.Path;
state.InputProtocol = MediaProtocol.File;
await Task.Delay(1000, cancellationTokenSource.Token).ConfigureAwait(false);
await Task.Delay(1500, cancellationTokenSource.Token).ConfigureAwait(false);
}
else if (!string.IsNullOrEmpty(streamInfo.Url))
{
@@ -838,7 +838,7 @@ namespace MediaBrowser.Api.Playback
state.MediaPath = streamInfo.Path;
state.InputProtocol = MediaProtocol.File;
await Task.Delay(1000, cancellationTokenSource.Token).ConfigureAwait(false);
await Task.Delay(1500, cancellationTokenSource.Token).ConfigureAwait(false);
}
else if (!string.IsNullOrEmpty(streamInfo.Url))
{
@@ -943,19 +943,6 @@ namespace MediaBrowser.Api.Playback
{
await Task.Delay(100, cancellationTokenSource.Token).ConfigureAwait(false);
}
// Allow a small amount of time to buffer a little
// But not with HLS because it already has it's own wait
if (state.IsInputVideo && TranscodingJobType != TranscodingJobType.Hls)
{
await Task.Delay(500, cancellationTokenSource.Token).ConfigureAwait(false);
}
// This is arbitrary, but add a little buffer time when internet streaming
if (state.InputProtocol != MediaProtocol.File)
{
await Task.Delay(2500, cancellationTokenSource.Token).ConfigureAwait(false);
}
}
private async void StartStreamingLog(StreamState state, Stream source, Stream target)
@@ -1458,11 +1445,6 @@ namespace MediaBrowser.Api.Playback
state.RunTimeTicks = recording.RunTimeTicks;
if (recording.RecordingInfo.Status == RecordingStatus.InProgress)
{
await Task.Delay(1000, cancellationToken).ConfigureAwait(false);
}
state.OutputAudioSync = "1000";
state.InputVideoSync = "-1";
state.InputAudioSync = "1";