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

update subtitle encoder to allow format passthrough

Browse Source
This commit is contained in:
Luke Pulverenti 2015-12-27 16:07:28 -05:00
parent 78e6d1b80f
commit 6eb5d34af1
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,10 +122,15 @@ namespace MediaBrowser.MediaEncoding.Subtitles
var subtitle = await GetSubtitleStream(itemId, mediaSourceId, subtitleStreamIndex, cancellationToken) var subtitle = await GetSubtitleStream(itemId, mediaSourceId, subtitleStreamIndex, cancellationToken)
.ConfigureAwait(false); .ConfigureAwait(false);
using (var stream = subtitle.Item1)
{
var inputFormat = subtitle.Item2; var inputFormat = subtitle.Item2;
if (string.Equals(inputFormat, outputFormat, StringComparison.OrdinalIgnoreCase) && TryGetWriter(outputFormat) == null)
{
return subtitle.Item1;
}
using (var stream = subtitle.Item1)
{
return await ConvertSubtitles(stream, inputFormat, outputFormat, startTimeTicks, endTimeTicks, cancellationToken).ConfigureAwait(false); return await ConvertSubtitles(stream, inputFormat, outputFormat, startTimeTicks, endTimeTicks, cancellationToken).ConfigureAwait(false);
} }
} }
@ -288,7 +293,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
return null; return null;
} }
private ISubtitleWriter GetWriter(string format) private ISubtitleWriter TryGetWriter(string format)
{ {
if (string.IsNullOrEmpty(format)) if (string.IsNullOrEmpty(format))
{ {
@ -312,6 +317,18 @@ namespace MediaBrowser.MediaEncoding.Subtitles
return new TtmlWriter(); return new TtmlWriter();
} }
return null;
}
private ISubtitleWriter GetWriter(string format)
{
var writer = TryGetWriter(format);
if (writer != null)
{
return writer;
}
throw new ArgumentException("Unsupported format: " + format); throw new ArgumentException("Unsupported format: " + format);
} }