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

Merge pull request #1351 from MediaBrowser/master

Browse Source 
update BdInfo probing
This commit is contained in:
Luke 2015-12-22 12:35:15 -05:00
commit fabe9b1caa
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Entities/Video.cs
View File

@ -298,8 +298,6 @@ namespace MediaBrowser.Controller.Entities
return base.IsValidFromResolver(newItem); return base.IsValidFromResolver(newItem);
} }
public string MainFeaturePlaylistName { get; set; }
/// <summary> /// <summary>
/// Gets the playable stream files. /// Gets the playable stream files.
/// </summary> /// </summary>

10
MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
View File

@ -297,6 +297,11 @@ namespace MediaBrowser.Providers.MediaInfo
{ {
var video = (Video)item; var video = (Video)item;
video.PlayableStreamFileNames = blurayInfo.Files.ToList();
// Use BD Info if it has multiple m2ts. Otherwise, treat it like a video file and rely more on ffprobe output
if (blurayInfo.Files.Count > 1)
{
int? currentHeight = null; int? currentHeight = null;
int? currentWidth = null; int? currentWidth = null;
int? currentBitRate = null; int? currentBitRate = null;
@ -315,15 +320,11 @@ namespace MediaBrowser.Providers.MediaInfo
mediaStreams.Clear(); mediaStreams.Clear();
mediaStreams.AddRange(blurayInfo.MediaStreams); mediaStreams.AddRange(blurayInfo.MediaStreams);
video.MainFeaturePlaylistName = blurayInfo.PlaylistName;
if (blurayInfo.RunTimeTicks.HasValue && blurayInfo.RunTimeTicks.Value > 0) if (blurayInfo.RunTimeTicks.HasValue && blurayInfo.RunTimeTicks.Value > 0)
{ {
video.RunTimeTicks = blurayInfo.RunTimeTicks; video.RunTimeTicks = blurayInfo.RunTimeTicks;
} }
video.PlayableStreamFileNames = blurayInfo.Files.ToList();
if (blurayInfo.Chapters != null) if (blurayInfo.Chapters != null)
{ {
chapters.Clear(); chapters.Clear();
@ -345,6 +346,7 @@ namespace MediaBrowser.Providers.MediaInfo
videoStream.Height = IsEmpty(videoStream.Height) ? currentHeight : videoStream.Height; videoStream.Height = IsEmpty(videoStream.Height) ? currentHeight : videoStream.Height;
} }
} }
}
private bool IsEmpty(int? num) private bool IsEmpty(int? num)
{ {