michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

don't cache encoded media on resume

Browse Source
This commit is contained in:
Luke Pulverenti 2013-06-11 22:59:38 -04:00
parent 0e55f3de58
commit 456dea09df
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MediaBrowser.Api/ApiEntryPoint.cs
View File

@ -82,7 +82,9 @@ namespace MediaBrowser.Api
/// <param name="path">The path.</param> /// <param name="path">The path.</param>
/// <param name="type">The type.</param> /// <param name="type">The type.</param>
/// <param name="process">The process.</param> /// <param name="process">The process.</param>
public void OnTranscodeBeginning(string path, TranscodingJobType type, Process process) /// <param name="isVideo">if set to <c>true</c> [is video].</param>
/// <param name="startTimeTicks">The start time ticks.</param>
public void OnTranscodeBeginning(string path, TranscodingJobType type, Process process, bool isVideo, long? startTimeTicks)
{ {
lock (_activeTranscodingJobs) lock (_activeTranscodingJobs)
{ {
@ -91,7 +93,9 @@ namespace MediaBrowser.Api
Type = type, Type = type,
Path = path, Path = path,
Process = process, Process = process,
ActiveRequestCount = 1 ActiveRequestCount = 1,
IsVideo = isVideo,
StartTimeTicks = startTimeTicks
}); });
} }
} }
@ -262,7 +266,7 @@ namespace MediaBrowser.Api
} }
catch (InvalidOperationException) catch (InvalidOperationException)
{ {
} }
catch (NotSupportedException) catch (NotSupportedException)
{ {
@ -273,7 +277,8 @@ namespace MediaBrowser.Api
process.Dispose(); process.Dispose();
// If it didn't complete successfully cleanup the partial files // If it didn't complete successfully cleanup the partial files
if (!hasExitedSuccessfully) // Also don't cache output from resume points
if (!hasExitedSuccessfully || job.StartTimeTicks.HasValue)
{ {
Logger.Info("Deleting partial stream file(s) {0}", job.Path); Logger.Info("Deleting partial stream file(s) {0}", job.Path);
@ -364,6 +369,9 @@ namespace MediaBrowser.Api
/// </summary> /// </summary>
/// <value>The kill timer.</value> /// <value>The kill timer.</value>
public Timer KillTimer { get; set; } public Timer KillTimer { get; set; }
public bool IsVideo { get; set; }
public long? StartTimeTicks { get; set; }
} }
/// <summary> /// <summary>

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

@ -598,7 +598,7 @@ namespace MediaBrowser.Api.Playback
EnableRaisingEvents = true EnableRaisingEvents = true
}; };
ApiEntryPoint.Instance.OnTranscodeBeginning(outputPath, TranscodingJobType, process); ApiEntryPoint.Instance.OnTranscodeBeginning(outputPath, TranscodingJobType, process, video != null, state.Request.StartTimeTicks);
Logger.Info(process.StartInfo.FileName + " " + process.StartInfo.Arguments); Logger.Info(process.StartInfo.FileName + " " + process.StartInfo.Arguments);