Merge pull request #2034 from MediaBrowser/dev

Dev

MediaBrowser.Api/Playback/Progressive/VideoService.cs

@@ -149,11 +149,11 @@ namespace MediaBrowser.Api.Playback.Progressive
                 {
                     args += " -copyts -avoid_negative_ts disabled -start_at_zero";
                 }
-                
+
                 return args;
             }
 
-            var keyFrameArg = string.Format(" -force_key_frames expr:gte(t,n_forced*{0})",
+            var keyFrameArg = string.Format(" -force_key_frames \"expr:gte(t,n_forced*{0})\"",
                 5.ToString(UsCulture));
 
             args += keyFrameArg;
@@ -237,4 +237,4 @@ namespace MediaBrowser.Api.Playback.Progressive
             return args;
         }
     }
-}
+}

MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs

@@ -87,6 +87,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 "h264_nvenc",
                 "h264_qsv",
                 "h264_omx",
+                "h264_vaapi",
                 "ac3"
             };
 
@@ -156,4 +157,4 @@ namespace MediaBrowser.MediaEncoding.Encoder
             }
         }
     }
-}
+}

MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs

@@ -84,7 +84,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 return args;
             }
 
-            var keyFrameArg = string.Format(" -force_key_frames expr:gte(t,n_forced*{0})",
+            var keyFrameArg = string.Format(" -force_key_frames \"expr:gte(t,n_forced*{0})\"",
                 5.ToString(UsCulture));
 
             args += keyFrameArg;
@@ -192,4 +192,4 @@ namespace MediaBrowser.MediaEncoding.Encoder
             get { return true; }
         }
     }
-}
+}

MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs

@@ -191,7 +191,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             {
                 var maxBitrate = 25000000;
                 videoArgs = string.Format(
-                        "-codec:v:0 libx264 -force_key_frames expr:gte(t,n_forced*5) {0} -pix_fmt yuv420p -preset superfast -crf 23 -b:v {1} -maxrate {1} -bufsize ({1}*2) -vsync -1 -profile:v high -level 41",
+                        "-codec:v:0 libx264 -force_key_frames \"expr:gte(t,n_forced*5)\" {0} -pix_fmt yuv420p -preset superfast -crf 23 -b:v {1} -maxrate {1} -bufsize ({1}*2) -vsync -1 -profile:v high -level 41",
                         GetOutputSizeParam(),
                         maxBitrate.ToString(CultureInfo.InvariantCulture));
             }
@@ -354,4 +354,4 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             }
         }
     }
-}
+}

MediaBrowser.Tests/ConsistencyTests/StringUsageReporter.cs

@@ -71,7 +71,7 @@ namespace MediaBrowser.Tests.ConsistencyTests
         /// <summary>
         /// List of file extension to search.
         /// </summary>
-        public static string[] TargetExtensions = new[] { "js", "html" };
+        public static string[] TargetExtensions = new[] { ".js", ".html" };
 
         /// <summary>
         /// List of paths to exclude from search.
@@ -96,11 +96,11 @@ namespace MediaBrowser.Tests.ConsistencyTests
             }
         }
 
-        [TestMethod]
-        public void ReportStringUsage()
-        {
-            this.CheckDashboardStrings(false);
-        }
+        //[TestMethod]
+        //public void ReportStringUsage()
+        //{
+        //    this.CheckDashboardStrings(false);
+        //}
 
         [TestMethod]
         public void ReportUnusedStrings()
@@ -135,7 +135,7 @@ namespace MediaBrowser.Tests.ConsistencyTests
 
             var allFiles = rootFolderInfo.GetFiles("*", SearchOption.AllDirectories);
 
-            var filteredFiles1 = allFiles.Where(f => TargetExtensions.Any(e => f.Name.EndsWith(e)));
+            var filteredFiles1 = allFiles.Where(f => TargetExtensions.Any(e => string.Equals(e, f.Extension, StringComparison.OrdinalIgnoreCase)));
             var filteredFiles2 = filteredFiles1.Where(f => !ExcludePaths.Any(p => f.FullName.Contains(p)));
 
             var selectedFiles = filteredFiles2.OrderBy(f => f.FullName).ToList();

MediaBrowser.sln

@@ -65,6 +65,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.Drawing", "Emby.Drawing\Emby.Drawing.csproj", "{08FFF49B-F175-4807-A2B5-73B0EBD9F716}"
 EndProject
 Global
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms