Browse Source

update startup tests

Luke Pulverenti 9 years ago
parent
commit
580a68d19c

+ 1 - 1
MediaBrowser.Common.Implementations/Serialization/JsonSerializer.cs

@@ -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);
         }
 

+ 2 - 2
MediaBrowser.Common.Implementations/Serialization/XmlSerializer.cs

@@ -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);

+ 7 - 5
MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs

@@ -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();
                 }

+ 1 - 1
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs

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