Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-08 16:14:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

update subtitles

Browse Source
This commit is contained in:
Luke Pulverenti 2015-12-26 03:07:24 -05:00
parent c2a88b8a9d
commit c5f5e0175b
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
MediaBrowser.Controller/MediaEncoding/MediaStreamSelector.cs
View File

@ -50,6 +50,22 @@ namespace MediaBrowser.Controller.MediaEncoding
if (mode == SubtitlePlaybackMode.Default) if (mode == SubtitlePlaybackMode.Default)
{ {
// Prefer embedded metadata over smart logic
stream = streams.FirstOrDefault(s => s.IsForced && string.Equals(s.Language, audioTrackLanguage, StringComparison.OrdinalIgnoreCase)) ??
streams.FirstOrDefault(s => s.IsForced) ??
streams.FirstOrDefault(s => s.IsDefault);
// if the audio language is not understood by the user, load their preferred subs, if there are any
if (stream == null && !ContainsOrdinal(preferredLanguages, audioTrackLanguage))
{
stream = streams.Where(s => !s.IsForced).FirstOrDefault(s => ContainsOrdinal(preferredLanguages, s.Language));
}
}
else if (mode == SubtitlePlaybackMode.Smart)
{
// Prefer smart logic over embedded metadata
// if the audio language is not understood by the user, load their preferred subs, if there are any // if the audio language is not understood by the user, load their preferred subs, if there are any
if (!ContainsOrdinal(preferredLanguages, audioTrackLanguage)) if (!ContainsOrdinal(preferredLanguages, audioTrackLanguage))
{ {
@ -61,6 +77,12 @@ namespace MediaBrowser.Controller.MediaEncoding
// always load the most suitable full subtitles // always load the most suitable full subtitles
stream = streams.FirstOrDefault(s => !s.IsForced); stream = streams.FirstOrDefault(s => !s.IsForced);
} }
else if (mode == SubtitlePlaybackMode.OnlyForced)
{
// always load the most suitable full subtitles
stream = streams.FirstOrDefault(s => s.IsForced && string.Equals(s.Language, audioTrackLanguage, StringComparison.OrdinalIgnoreCase)) ??
streams.FirstOrDefault(s => s.IsForced);
}
// load forced subs if we have found no suitable full subtitles // load forced subs if we have found no suitable full subtitles
stream = stream ?? streams.FirstOrDefault(s => s.IsForced && string.Equals(s.Language, audioTrackLanguage, StringComparison.OrdinalIgnoreCase)); stream = stream ?? streams.FirstOrDefault(s => s.IsForced && string.Equals(s.Language, audioTrackLanguage, StringComparison.OrdinalIgnoreCase));
@ -112,6 +134,15 @@ namespace MediaBrowser.Controller.MediaEncoding
if (mode == SubtitlePlaybackMode.Default) if (mode == SubtitlePlaybackMode.Default)
{ {
// Prefer embedded metadata over smart logic
filteredStreams = streams.Where(s => s.IsForced || s.IsDefault)
.ToList();
}
else if (mode == SubtitlePlaybackMode.Smart)
{
// Prefer smart logic over embedded metadata
// if the audio language is not understood by the user, load their preferred subs, if there are any // if the audio language is not understood by the user, load their preferred subs, if there are any
if (!ContainsOrdinal(preferredLanguages, audioTrackLanguage)) if (!ContainsOrdinal(preferredLanguages, audioTrackLanguage))
{ {
@ -125,6 +156,11 @@ namespace MediaBrowser.Controller.MediaEncoding
filteredStreams = streams.Where(s => !s.IsForced) filteredStreams = streams.Where(s => !s.IsForced)
.ToList(); .ToList();
} }
else if (mode == SubtitlePlaybackMode.OnlyForced)
{
// always load the most suitable full subtitles
filteredStreams = streams.Where(s => s.IsForced).ToList();
}
// load forced subs if we have found no suitable full subtitles // load forced subs if we have found no suitable full subtitles
if (filteredStreams.Count == 0) if (filteredStreams.Count == 0)
@ -148,6 +184,7 @@ namespace MediaBrowser.Controller.MediaEncoding
values.Add(index == -1 ? 0 : 100 - index); values.Add(index == -1 ? 0 : 100 - index);
values.Add(stream.IsForced ? 1 : 0);
values.Add(stream.IsDefault ? 1 : 0); values.Add(stream.IsDefault ? 1 : 0);
values.Add(stream.SupportsExternalStream ? 1 : 0); values.Add(stream.SupportsExternalStream ? 1 : 0);
values.Add(stream.IsTextSubtitleStream ? 1 : 0); values.Add(stream.IsTextSubtitleStream ? 1 : 0);

3
MediaBrowser.Model/Configuration/SubtitlePlaybackMode.cs
View File

@ -5,6 +5,7 @@
Default = 0, Default = 0,
Always = 1, Always = 1,
OnlyForced = 2, OnlyForced = 2,
None = 3 None = 3,
Smart = 4
} }
} }