starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 05:53:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

update components

Browse Source
This commit is contained in:
Luke Pulverenti
2017-02-26 16:47:52 -05:00
parent 666604e8cb
commit 5fa3817a76
35 changed files with 51 additions and 1397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@@ -154,6 +154,23 @@ namespace MediaBrowser.Controller.MediaEncoding
{
return "mpegts";
}
if (string.Equals(container, "mpg", StringComparison.OrdinalIgnoreCase))
{
return "mpeg";
}
// For these need to find out the ffmpeg names
if (string.Equals(container, "m2ts", StringComparison.OrdinalIgnoreCase))
{
return null;
}
if (string.Equals(container, "wmv", StringComparison.OrdinalIgnoreCase))
{
return null;
}
if (string.Equals(container, "vob", StringComparison.OrdinalIgnoreCase))
{
return null;
}
return container;
}
@@ -1477,7 +1494,7 @@ namespace MediaBrowser.Controller.MediaEncoding
//inputModifier += " -noaccurate_seek";
}
if (!string.IsNullOrWhiteSpace(state.InputContainer))
if (!string.IsNullOrWhiteSpace(state.InputContainer) && state.VideoType == VideoType.VideoFile)
{
var inputFormat = GetInputFormat(state.InputContainer);
if (!string.IsNullOrWhiteSpace(inputFormat))
@@ -1486,7 +1503,8 @@ namespace MediaBrowser.Controller.MediaEncoding
}
}
if (state.RunTimeTicks.HasValue && string.IsNullOrWhiteSpace(encodingOptions.HardwareAccelerationType))
// Only do this for video files due to sometimes unpredictable codec names coming from BDInfo
if (state.RunTimeTicks.HasValue && string.IsNullOrWhiteSpace(encodingOptions.HardwareAccelerationType) && state.VideoType == VideoType.VideoFile)
{
foreach (var stream in state.MediaSource.MediaStreams)
{