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

Merge pull request #2034 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-08-07 16:17:30 -04:00 committed by GitHub
commit ef487602e6
6 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Api/Playback/Progressive/VideoService.cs
View File

@ -149,11 +149,11 @@ namespace MediaBrowser.Api.Playback.Progressive
{ {
args += " -copyts -avoid_negative_ts disabled -start_at_zero"; args += " -copyts -avoid_negative_ts disabled -start_at_zero";
} }
return args; 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)); 5.ToString(UsCulture));
args += keyFrameArg; args += keyFrameArg;
@ -237,4 +237,4 @@ namespace MediaBrowser.Api.Playback.Progressive
return args; return args;
} }
} }
} }

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

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

4
MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
View File

@ -84,7 +84,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
return args; 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)); 5.ToString(UsCulture));
args += keyFrameArg; args += keyFrameArg;
@ -192,4 +192,4 @@ namespace MediaBrowser.MediaEncoding.Encoder
get { return true; } get { return true; }
} }
} }
} }

4
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
View File

@ -191,7 +191,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
{ {
var maxBitrate = 25000000; var maxBitrate = 25000000;
videoArgs = string.Format( 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(), GetOutputSizeParam(),
maxBitrate.ToString(CultureInfo.InvariantCulture)); maxBitrate.ToString(CultureInfo.InvariantCulture));
} }
@ -354,4 +354,4 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
} }
} }
} }
} }

14
MediaBrowser.Tests/ConsistencyTests/StringUsageReporter.cs
View File

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

3
MediaBrowser.sln
View File

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