michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #818 from thogil/subtitle_selection

Browse Source 
Updated default subtitle selection logic
This commit is contained in:
Luke 2014-05-12 15:19:16 -04:00
commit bf0e9d36a9
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
MediaBrowser.Model/MediaInfo/MediaStreamSelector.cs
View File

@ -10,7 +10,7 @@ namespace MediaBrowser.Model.MediaInfo
{ {
public static int? GetDefaultAudioStreamIndex(List<MediaStream> streams, IEnumerable<string> preferredLanguages, bool preferDefaultTrack) public static int? GetDefaultAudioStreamIndex(List<MediaStream> streams, IEnumerable<string> preferredLanguages, bool preferDefaultTrack)
{ {
streams = GetSortedStreams(streams, MediaStreamType.Audio, preferredLanguages.FirstOrDefault()) streams = GetSortedStreams(streams, MediaStreamType.Audio, preferredLanguages.ToList())
.ToList(); .ToList();
if (preferDefaultTrack) if (preferDefaultTrack)
@ -38,25 +38,36 @@ namespace MediaBrowser.Model.MediaInfo
SubtitlePlaybackMode mode, SubtitlePlaybackMode mode,
string audioTrackLanguage) string audioTrackLanguage)
{ {
streams = GetSortedStreams(streams, MediaStreamType.Subtitle, preferredLanguages.FirstOrDefault()) var languages = preferredLanguages as List<string> ?? preferredLanguages.ToList();
.ToList(); streams = GetSortedStreams(streams, MediaStreamType.Subtitle, languages).ToList();
var full = streams.Where(s => !s.IsForced);
var forced = streams.Where(s => s.IsForced && string.Equals(s.Language, audioTrackLanguage, StringComparison.OrdinalIgnoreCase));
MediaStream stream = null; MediaStream stream = null;
if (mode == SubtitlePlaybackMode.None)
{
return null;
}
if (mode == SubtitlePlaybackMode.Default) if (mode == SubtitlePlaybackMode.Default)
{ {
stream = streams.FirstOrDefault(i => i.IsDefault); // if the audio language is not understood by the user, load their preferred subs, if there are any
if (!ContainsOrdinal(languages, audioTrackLanguage))
{
stream = full.FirstOrDefault(s => ContainsOrdinal(languages, s.Language));
}
} }
else if (mode == SubtitlePlaybackMode.Always) else if (mode == SubtitlePlaybackMode.Always)
{ {
stream = streams.FirstOrDefault(i => i.IsDefault) ?? // always load the most suitable full subtitles
streams.FirstOrDefault(); stream = full.FirstOrDefault();
}
else if (mode == SubtitlePlaybackMode.OnlyForced)
{
stream = streams.FirstOrDefault(i => i.IsForced);
} }
// load forced subs if we have found no suitable full subtitles
stream = stream ?? forced.FirstOrDefault();
if (stream != null) if (stream != null)
{ {
return stream.Index; return stream.Index;
@ -65,19 +76,24 @@ namespace MediaBrowser.Model.MediaInfo
return null; return null;
} }
private static IEnumerable<MediaStream> GetSortedStreams(IEnumerable<MediaStream> streams, MediaStreamType type, string defaultLanguage) private static bool ContainsOrdinal(IEnumerable<string> list, string item)
{
return list.Any(i => string.Equals(i, item, StringComparison.OrdinalIgnoreCase));
}
private static IEnumerable<MediaStream> GetSortedStreams(IEnumerable<MediaStream> streams, MediaStreamType type, List<string> languagePreferences)
{ {
var orderStreams = streams var orderStreams = streams
.Where(i => i.Type == type); .Where(i => i.Type == type);
if (string.IsNullOrEmpty(defaultLanguage)) if (languagePreferences.Count == 0)
{ {
return orderStreams.OrderBy(i => i.IsDefault) return orderStreams.OrderBy(i => i.IsDefault)
.ThenBy(i => i.Index) .ThenBy(i => i.Index)
.ToList(); .ToList();
} }
return orderStreams.OrderBy(i => string.Equals(i.Language, defaultLanguage, StringComparison.OrdinalIgnoreCase)) return orderStreams.OrderBy(i => languagePreferences.FindIndex(l => string.Equals(i.Language, l, StringComparison.OrdinalIgnoreCase)))
.ThenBy(i => i.IsDefault) .ThenBy(i => i.IsDefault)
.ThenBy(i => i.Index) .ThenBy(i => i.Index)
.ToList(); .ToList();