starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-30 04:34:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

update translations

Browse Source
This commit is contained in:
Luke Pulverenti
2015-05-22 11:59:17 -04:00
parent 11aa20a7b8
commit ae768735aa
97 changed files with 255 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
MediaBrowser.Api/ApiEntryPoint.cs
View File

@@ -339,14 +339,23 @@ namespace MediaBrowser.Api
return;
}
var timerDuration = job.Type == TranscodingJobType.Progressive ?
1000 :
1800000;
var timerDuration = 1000;
// We can really reduce the timeout for apps that are using the newer api
if (!string.IsNullOrWhiteSpace(job.PlaySessionId) && job.Type != TranscodingJobType.Progressive)
if (job.Type != TranscodingJobType.Progressive)
{
timerDuration = 50000;
timerDuration = 1800000;
// We can really reduce the timeout for apps that are using the newer api
if (!string.IsNullOrWhiteSpace(job.PlaySessionId))
{
timerDuration = 60000;
// With newer just in time encoding, we no longer need to be aggressive about killing the stream
if (!job.IsLiveOutput)
{
timerDuration = 180000;
}
}
}
job.PingTimeout = timerDuration;
@@ -628,6 +637,9 @@ namespace MediaBrowser.Api
/// </summary>
/// <value>The live stream identifier.</value>
public string LiveStreamId { get; set; }
public bool IsLiveOutput { get; set; }
/// <summary>
/// Gets or sets the path.
/// </summary>