lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2149 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-09-09 14:27:09 -04:00 committed by GitHub
commit dd463ab06c
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -931,8 +931,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
var timeoutMs = ConfigurationManager.Configuration.ImageExtractionTimeoutMs; var timeoutMs = ConfigurationManager.Configuration.ImageExtractionTimeoutMs;
if (timeoutMs <= 0) if (timeoutMs <= 0)
{ {
timeoutMs = 10000; timeoutMs = Environment.Is64BitOperatingSystem ? (Environment.ProcessorCount > 2 ? 14000 : 20000) : 40000;
} }
ranToCompletion = process.WaitForExit(timeoutMs); ranToCompletion = process.WaitForExit(timeoutMs);
if (!ranToCompletion) if (!ranToCompletion)

1
MediaBrowser.Model/Configuration/EncodingOptions.cs
View File

@ -22,7 +22,6 @@ namespace MediaBrowser.Model.Configuration
EncodingThreadCount = -1; EncodingThreadCount = -1;
VaapiDevice = "/dev/dri/card0"; VaapiDevice = "/dev/dri/card0";
H264Crf = 23; H264Crf = 23;
H264Preset = "superfast";
} }
} }
} }

2
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -217,7 +217,7 @@ namespace MediaBrowser.Model.Configuration
Migrations = new string[] { }; Migrations = new string[] { };
CodecsUsed = new string[] { }; CodecsUsed = new string[] { };
SqliteCacheSize = 0; SqliteCacheSize = 0;
ImageExtractionTimeoutMs = 14000; ImageExtractionTimeoutMs = 0;
EnableLocalizedGuids = true; EnableLocalizedGuids = true;
DisplaySpecialsWithinSeasons = true; DisplaySpecialsWithinSeasons = true;

9
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@ -325,6 +325,15 @@ namespace MediaBrowser.Server.Startup.Common
await MediaEncoder.Init().ConfigureAwait(false); await MediaEncoder.Init().ConfigureAwait(false);
if (string.IsNullOrWhiteSpace(MediaEncoder.EncoderPath))
{
if (ServerConfigurationManager.Configuration.IsStartupWizardCompleted)
{
ServerConfigurationManager.Configuration.IsStartupWizardCompleted = false;
ServerConfigurationManager.SaveConfiguration();
}
}
Logger.Info("ServerId: {0}", SystemId); Logger.Info("ServerId: {0}", SystemId);
Logger.Info("Core startup complete"); Logger.Info("Core startup complete");
HttpServer.GlobalResponse = null; HttpServer.GlobalResponse = null;