pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve subtitle responses

This commit is contained in:
Luke Pulverenti 2017-02-16 02:14:12 -05:00
parent aa290062d6
commit 03317b291d
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View File

@ -19,6 +19,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using MediaBrowser.Model.Diagnostics; using MediaBrowser.Model.Diagnostics;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Text; using MediaBrowser.Model.Text;
using UniversalDetector; using UniversalDetector;
@ -137,18 +138,29 @@ namespace MediaBrowser.MediaEncoding.Subtitles
throw new ArgumentNullException("mediaSourceId"); throw new ArgumentNullException("mediaSourceId");
} }
var subtitle = await GetSubtitleStream(itemId, mediaSourceId, subtitleStreamIndex, cancellationToken) var mediaSources = await _mediaSourceManager.GetPlayackMediaSources(itemId, null, false, new[] { MediaType.Audio, MediaType.Video }, cancellationToken).ConfigureAwait(false);
var mediaSource = mediaSources
.First(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));
var subtitleStream = mediaSource.MediaStreams
.First(i => i.Type == MediaStreamType.Subtitle && i.Index == subtitleStreamIndex);
var subtitle = await GetSubtitleStream(mediaSource, subtitleStream, cancellationToken)
.ConfigureAwait(false); .ConfigureAwait(false);
var inputFormat = subtitle.Item2; var inputFormat = subtitle.Item2;
var writer = TryGetWriter(outputFormat); var writer = TryGetWriter(outputFormat);
if (string.Equals(inputFormat, outputFormat, StringComparison.OrdinalIgnoreCase) && writer == null) // Return the original if we don't have any way of converting it
if (writer == null)
{ {
return subtitle.Item1; return subtitle.Item1;
} }
if (writer == null) // Return the original if the same format is being requested
// Character encoding was already handled in GetSubtitleStream
if (string.Equals(inputFormat, outputFormat, StringComparison.OrdinalIgnoreCase))
{ {
return subtitle.Item1; return subtitle.Item1;
} }
@ -159,36 +171,17 @@ namespace MediaBrowser.MediaEncoding.Subtitles
} }
} }
private async Task<Tuple<Stream, string>> GetSubtitleStream(string itemId, private async Task<Tuple<Stream, string>> GetSubtitleStream(MediaSourceInfo mediaSource,
string mediaSourceId, MediaStream subtitleStream,
int subtitleStreamIndex,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
if (string.IsNullOrWhiteSpace(itemId))
{
throw new ArgumentNullException("itemId");
}
if (string.IsNullOrWhiteSpace(mediaSourceId))
{
throw new ArgumentNullException("mediaSourceId");
}
var mediaSources = await _mediaSourceManager.GetPlayackMediaSources(itemId, null, false, new[] { MediaType.Audio, MediaType.Video }, cancellationToken).ConfigureAwait(false);
var mediaSource = mediaSources
.First(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));
var subtitleStream = mediaSource.MediaStreams
.First(i => i.Type == MediaStreamType.Subtitle && i.Index == subtitleStreamIndex);
var inputFiles = new[] { mediaSource.Path }; var inputFiles = new[] { mediaSource.Path };
if (mediaSource.VideoType.HasValue) if (mediaSource.VideoType.HasValue)
{ {
if (mediaSource.VideoType.Value == VideoType.BluRay || if (mediaSource.VideoType.Value == VideoType.BluRay || mediaSource.VideoType.Value == VideoType.Dvd)
mediaSource.VideoType.Value == VideoType.Dvd)
{ {
var mediaSourceItem = (Video)_libraryManager.GetItemById(new Guid(mediaSourceId)); var mediaSourceItem = (Video)_libraryManager.GetItemById(new Guid(mediaSource.Id));
inputFiles = mediaSourceItem.GetPlayableStreamFiles().ToArray(); inputFiles = mediaSourceItem.GetPlayableStreamFiles().ToArray();
} }
} }