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

update startup tests

Browse Source
This commit is contained in:
Luke Pulverenti 2016-06-30 21:06:18 -04:00
parent 106087b685
commit 580a68d19c
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Common.Implementations/Serialization/JsonSerializer.cs
View File

@ -68,7 +68,7 @@ namespace MediaBrowser.Common.Implementations.Serialization
private Stream OpenFile(string path)
{
_logger.Info("Deserializing file {0}", path);
_logger.Debug("Deserializing file {0}", path);
return new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, 131072);
}

4
MediaBrowser.Common.Implementations/Serialization/XmlSerializer.cs
View File

@ -80,7 +80,7 @@ namespace MediaBrowser.Common.Implementations.Serialization
/// <param name="file">The file.</param>
public void SerializeToFile(object obj, string file)
{
_logger.Info("Serializing to file {0}", file);
_logger.Debug("Serializing to file {0}", file);
using (var stream = new FileStream(file, FileMode.Create))
{
SerializeToStream(obj, stream);
@ -95,7 +95,7 @@ namespace MediaBrowser.Common.Implementations.Serialization
/// <returns>System.Object.</returns>
public object DeserializeFromFile(Type type, string file)
{
_logger.Info("Deserializing file {0}", file);
_logger.Debug("Deserializing file {0}", file);
using (var stream = _fileSystem.OpenRead(file))
{
return DeserializeFromStream(type, stream);

12
MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
View File

@ -78,17 +78,19 @@ namespace MediaBrowser.MediaEncoding.Encoder
"libx265",
"mpeg4",
"msmpeg4",
//"libvpx",
//"libvpx-vp9",
"libvpx",
"libvpx-vp9",
"aac",
"libmp3lame",
"libopus",
//"libvorbis",
"libvorbis",
"srt",
"h264_nvenc",
"h264_qsv"
};
output = output ?? string.Empty;
foreach (var codec in required)
{
var srch = " " + codec + " ";
@ -116,7 +118,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false,
RedirectStandardOutput = true,
RedirectStandardError = true
//RedirectStandardError = true
}
};
@ -126,7 +128,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
try
{
process.BeginErrorReadLine();
//process.BeginErrorReadLine();
return process.StandardOutput.ReadToEnd();
}

2
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View File

@ -455,7 +455,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
throw;
}
var logTask = process.StandardError.BaseStream.CopyToAsync(logFileStream);
var ranToCompletion = process.WaitForExit(60000);