pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add session reporting error handling

This commit is contained in:
Luke Pulverenti 2017-07-12 14:54:46 -04:00
parent a238556202
commit b8d4ef5fc6
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,16 @@ namespace MediaBrowser.Api.Playback.Hls
/// <returns>System.String.</returns>
protected override string GetVideoArguments(StreamState state)
{
if (!state.IsOutputVideo)
{
return string.Empty;
}
// No known video stream
if (state.VideoStream == null)
{
return string.Empty;
}
var codec = EncodingHelper.GetVideoEncoder(state, ApiEntryPoint.Instance.GetEncodingOptions());
var args = "-codec:v:0 " + codec;

14
MediaBrowser.Controller/Session/SessionInfo.cs
View File

@ -203,6 +203,11 @@ namespace MediaBrowser.Controller.Session
public void StartAutomaticProgress(ITimerFactory timerFactory, PlaybackProgressInfo progressInfo)
{
if (_disposed)
{
return;
}
lock (_progressLock)
{
_lastProgressInfo = progressInfo;
@ -223,6 +228,11 @@ namespace MediaBrowser.Controller.Session
private async void OnProgressTimerCallback(object state)
{
if (_disposed)
{
return;
}
var progressInfo = _lastProgressInfo;
if (progressInfo == null)
{
@ -274,8 +284,12 @@ namespace MediaBrowser.Controller.Session
}
}
private bool _disposed = false;
public void Dispose()
{
_disposed = true;
StopAutomaticProgress();
_sessionManager = null;
}

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.24.1")]
[assembly: AssemblyVersion("3.2.25.2")]