mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04:00
Merge pull request #1351 from MediaBrowser/master
update BdInfo probing
This commit is contained in:
commit
fabe9b1caa
@ -298,8 +298,6 @@ namespace MediaBrowser.Controller.Entities
|
||||
return base.IsValidFromResolver(newItem);
|
||||
}
|
||||
|
||||
public string MainFeaturePlaylistName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets the playable stream files.
|
||||
/// </summary>
|
||||
|
@ -297,6 +297,11 @@ namespace MediaBrowser.Providers.MediaInfo
|
||||
{
|
||||
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? currentWidth = null;
|
||||
int? currentBitRate = null;
|
||||
@ -315,15 +320,11 @@ namespace MediaBrowser.Providers.MediaInfo
|
||||
mediaStreams.Clear();
|
||||
mediaStreams.AddRange(blurayInfo.MediaStreams);
|
||||
|
||||
video.MainFeaturePlaylistName = blurayInfo.PlaylistName;
|
||||
|
||||
if (blurayInfo.RunTimeTicks.HasValue && blurayInfo.RunTimeTicks.Value > 0)
|
||||
{
|
||||
video.RunTimeTicks = blurayInfo.RunTimeTicks;
|
||||
}
|
||||
|
||||
video.PlayableStreamFileNames = blurayInfo.Files.ToList();
|
||||
|
||||
if (blurayInfo.Chapters != null)
|
||||
{
|
||||
chapters.Clear();
|
||||
@ -345,6 +346,7 @@ namespace MediaBrowser.Providers.MediaInfo
|
||||
videoStream.Height = IsEmpty(videoStream.Height) ? currentHeight : videoStream.Height;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private bool IsEmpty(int? num)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user