Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

update merge

Browse Source
This commit is contained in:
Luke Pulverenti 2015-09-20 13:28:32 -04:00
parent 543cf723ef
commit 25c37e40ad
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@ -725,7 +725,7 @@ namespace MediaBrowser.Model.Dlna
public static SubtitleProfile GetSubtitleProfile(MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, EncodingContext context, PlayMethod playMethod) public static SubtitleProfile GetSubtitleProfile(MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, EncodingContext context, PlayMethod playMethod)
{ {
if (playMethod != PlayMethod.Transcode && !subtitleStream.IsExternal) if (playMethod != PlayMethod.Transcode && !subtitleStream.IsExternal)
{ {
// Look for supported embedded subs // Look for supported embedded subs
foreach (SubtitleProfile profile in subtitleProfiles) foreach (SubtitleProfile profile in subtitleProfiles)
@ -749,11 +749,11 @@ namespace MediaBrowser.Model.Dlna
// Look for an external profile that matches the stream type (text/graphical) // Look for an external profile that matches the stream type (text/graphical)
foreach (SubtitleProfile profile in subtitleProfiles) foreach (SubtitleProfile profile in subtitleProfiles)
{ {
if (profile.Method != SubtitleDeliveryMethod.External) if (profile.Method != SubtitleDeliveryMethod.External)
{ {
continue; continue;
} }
if (!profile.SupportsLanguage(subtitleStream.Language)) if (!profile.SupportsLanguage(subtitleStream.Language))
{ {
@ -762,9 +762,9 @@ namespace MediaBrowser.Model.Dlna
if (subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format)) if (subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))
{ {
bool requiresConversion = !StringHelper.EqualsIgnoreCase(subtitleStream.Codec, profile.Format); bool requiresConversion = !StringHelper.EqualsIgnoreCase(subtitleStream.Codec, profile.Format);
if (subtitleStream.IsTextSubtitleStream || !requiresConversion) if (subtitleStream.IsTextSubtitleStream || !requiresConversion)
{ {
if (subtitleStream.SupportsExternalStream) if (subtitleStream.SupportsExternalStream)
{ {