alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-15 20:20:25 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

update stream closing

Browse Source
This commit is contained in:
Luke Pulverenti
2015-03-23 13:19:21 -04:00
parent 30a507eca8
commit e3a573ea97
8 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,8 @@ namespace MediaBrowser.Api.Playback
var data = GetCommandLineArguments("dummy\\dummy", "dummyTranscodingId", state, false);
data += "-" + (state.Request.DeviceId ?? string.Empty);
data += "-" + (state.Request.StreamId ?? state.Request.ClientTime ?? string.Empty);
data += "-" + (state.Request.StreamId ?? string.Empty);
data += "-" + (state.Request.ClientTime ?? string.Empty);
var dataHash = data.GetMD5().ToString("N");
@@ -1054,7 +1055,7 @@ namespace MediaBrowser.Api.Playback
}
var transcodingJob = ApiEntryPoint.Instance.OnTranscodeBeginning(outputPath,
state.Request.StreamId ?? state.Request.ClientTime,
state.Request.StreamId,
transcodingId,
TranscodingJobType,
process,
@@ -1524,7 +1525,7 @@ namespace MediaBrowser.Api.Playback
}
else if (i == 16)
{
request.StreamId = val;
request.ClientTime = val;
}
else if (i == 17)
{
@@ -1554,6 +1555,10 @@ namespace MediaBrowser.Api.Playback
videoRequest.Cabac = string.Equals("true", val, StringComparison.OrdinalIgnoreCase);
}
}
else if (i == 21)
{
request.StreamId = val;
}
}
}

2
MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
View File

@@ -136,7 +136,7 @@ namespace MediaBrowser.Api.Playback.Hls
// If the playlist doesn't already exist, startup ffmpeg
try
{
ApiEntryPoint.Instance.KillTranscodingJobs(request.DeviceId, request.StreamId ?? request.ClientTime, p => false);
ApiEntryPoint.Instance.KillTranscodingJobs(request.DeviceId, request.StreamId, p => false);
if (currentTranscodingIndex.HasValue)
{

5
MediaBrowser.Api/Playback/MediaInfoService.cs
View File

@@ -1,10 +1,10 @@
using System;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Net;
using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.MediaInfo;
using ServiceStack;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
@@ -68,6 +68,7 @@ namespace MediaBrowser.Api.Playback
}
result.MediaSources = mediaSources.ToList();
result.StreamId = Guid.NewGuid().ToString("N");
return ToOptimizedResult(result);
}