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

fix subtitle format

Browse Source
This commit is contained in:
Luke Pulverenti 2015-01-15 00:54:42 -05:00
parent ed06904193
commit e08963790d
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,7 +267,10 @@ namespace MediaBrowser.Model.Dlna
if (subtitleStream != null) if (subtitleStream != null)
{ {
playlistItem.SubtitleDeliveryMethod = GetSubtitleDeliveryMethod(subtitleStream, options); SubtitleProfile subtitleProfile = GetSubtitleProfile(subtitleStream, options);
playlistItem.SubtitleDeliveryMethod = subtitleProfile.Method;
playlistItem.SubtitleFormat = subtitleProfile.Format;
} }
return playlistItem; return playlistItem;
@ -289,7 +292,10 @@ namespace MediaBrowser.Model.Dlna
{ {
if (subtitleStream != null) if (subtitleStream != null)
{ {
playlistItem.SubtitleDeliveryMethod = GetSubtitleDeliveryMethod(subtitleStream, options); SubtitleProfile subtitleProfile = GetSubtitleProfile(subtitleStream, options);
playlistItem.SubtitleDeliveryMethod = subtitleProfile.Method;
playlistItem.SubtitleFormat = subtitleProfile.Format;
} }
playlistItem.PlayMethod = PlayMethod.Transcode; playlistItem.PlayMethod = PlayMethod.Transcode;
@ -525,9 +531,9 @@ namespace MediaBrowser.Model.Dlna
return false; return false;
} }
SubtitleDeliveryMethod subtitleMethod = GetSubtitleDeliveryMethod(subtitleStream, options); SubtitleProfile subtitleProfile = GetSubtitleProfile(subtitleStream, options);
if (subtitleMethod != SubtitleDeliveryMethod.External && subtitleMethod != SubtitleDeliveryMethod.Embed) if (subtitleProfile.Method != SubtitleDeliveryMethod.External && subtitleProfile.Method != SubtitleDeliveryMethod.Embed)
{ {
return false; return false;
} }
@ -536,43 +542,43 @@ namespace MediaBrowser.Model.Dlna
return IsAudioEligibleForDirectPlay(item, maxBitrate); return IsAudioEligibleForDirectPlay(item, maxBitrate);
} }
private SubtitleDeliveryMethod GetSubtitleDeliveryMethod(MediaStream subtitleStream, private SubtitleProfile GetSubtitleProfile(MediaStream subtitleStream, VideoOptions options)
VideoOptions options)
{ {
if (subtitleStream.IsTextSubtitleStream) if (subtitleStream.IsTextSubtitleStream)
{ {
// See if the device can retrieve the subtitles externally SubtitleProfile externalProfile = GetSubtitleProfile(options.Profile.SubtitleProfiles, SubtitleDeliveryMethod.External, _serverTextSubtitleOutputs);
bool supportsSubsExternally = options.Context == EncodingContext.Streaming &&
ContainsSubtitleFormat(options.Profile.SubtitleProfiles, SubtitleDeliveryMethod.External, _serverTextSubtitleOutputs);
if (supportsSubsExternally) if (options.Context == EncodingContext.Streaming && externalProfile != null)
{ {
return SubtitleDeliveryMethod.External; return externalProfile;
} }
// See if the device can retrieve the subtitles externally SubtitleProfile embedProfile = GetSubtitleProfile(options.Profile.SubtitleProfiles, SubtitleDeliveryMethod.Embed, _serverTextSubtitleOutputs);
bool supportsEmbedded = ContainsSubtitleFormat(options.Profile.SubtitleProfiles, SubtitleDeliveryMethod.Embed, _serverTextSubtitleOutputs);
if (supportsEmbedded) if (embedProfile != null)
{ {
return SubtitleDeliveryMethod.Embed; return embedProfile;
} }
} }
return SubtitleDeliveryMethod.Encode; return new SubtitleProfile
{
Method = SubtitleDeliveryMethod.Embed,
Format = subtitleStream.Codec
};
} }
private bool ContainsSubtitleFormat(SubtitleProfile[] profiles, SubtitleDeliveryMethod method, string[] formats) private SubtitleProfile GetSubtitleProfile(SubtitleProfile[] profiles, SubtitleDeliveryMethod method, string[] formats)
{ {
foreach (SubtitleProfile profile in profiles) foreach (SubtitleProfile profile in profiles)
{ {
if (method == profile.Method && ListHelper.ContainsIgnoreCase(formats, profile.Format)) if (method == profile.Method && ListHelper.ContainsIgnoreCase(formats, profile.Format))
{ {
return true; return profile;
} }
} }
return false; return null;
} }
private bool IsAudioEligibleForDirectPlay(MediaSourceInfo item, int? maxBitrate) private bool IsAudioEligibleForDirectPlay(MediaSourceInfo item, int? maxBitrate)