cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 18:08:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

add tv guide hover menus

Browse Source
This commit is contained in:
Luke Pulverenti 2014-01-15 17:19:45 -05:00
parent d0a5197c0a
commit 7d81888038
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,7 +318,17 @@ namespace MediaBrowser.Api.Playback
if (videoCodec.Equals("libx264", StringComparison.OrdinalIgnoreCase))
{
return "-preset superfast";
switch (GetQualitySetting())
{
case EncodingQuality.HighSpeed:
return "-preset ultrafast";
case EncodingQuality.HighQuality:
return "-preset superfast";
case EncodingQuality.MaxQuality:
return "-preset superfast";
default:
throw new Exception("Unrecognized MediaEncodingQuality value.");
}
}
if (videoCodec.Equals("mpeg4", StringComparison.OrdinalIgnoreCase))

6
MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
View File

@ -380,6 +380,10 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
CurrentProgress = null;
OnTaskCompleted(startTime, endTime, status, failureException);
// Bad practice, i know. But we keep a lot in memory, unfortunately.
GC.Collect(2, GCCollectionMode.Forced, true);
GC.Collect(2, GCCollectionMode.Forced, true);
}
/// <summary>
@ -390,7 +394,7 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
/// <returns>Task.</returns>
private Task ExecuteTask(CancellationToken cancellationToken, IProgress<double> progress)
{
return Task.Run(async () => await ScheduledTask.Execute(cancellationToken, progress).ConfigureAwait(false));
return Task.Run(async () => await ScheduledTask.Execute(cancellationToken, progress).ConfigureAwait(false), cancellationToken);
}
/// <summary>