alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-02 00:12:24 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

add server management to web client

Browse Source
This commit is contained in:
Luke Pulverenti
2014-11-04 07:41:12 -05:00
parent 7ca1cd8795
commit 60d3f47503
72 changed files with 20510 additions and 18390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,23 +58,13 @@ namespace MediaBrowser.MediaEncoding.Subtitles
try
{
// Return the original without any conversions, if possible
if (startTimeTicks == 0 &&
!endTimeTicks.HasValue &&
string.Equals(inputFormat, outputFormat, StringComparison.OrdinalIgnoreCase))
{
await stream.CopyToAsync(ms, 81920, cancellationToken).ConfigureAwait(false);
}
else
{
var trackInfo = await GetTrackInfo(stream, inputFormat, cancellationToken).ConfigureAwait(false);
var trackInfo = await GetTrackInfo(stream, inputFormat, cancellationToken).ConfigureAwait(false);
FilterEvents(trackInfo, startTimeTicks, endTimeTicks, false);
FilterEvents(trackInfo, startTimeTicks, endTimeTicks, false);
var writer = GetWriter(outputFormat);
var writer = GetWriter(outputFormat);
writer.Write(trackInfo, ms, cancellationToken);
}
writer.Write(trackInfo, ms, cancellationToken);
ms.Position = 0;
}
catch
@@ -239,10 +229,10 @@ namespace MediaBrowser.MediaEncoding.Subtitles
await ConvertTextSubtitleToSrt(subtitleStream.Path, outputPath, subtitleStream.Language, cancellationToken)
.ConfigureAwait(false);
return new Tuple<string, string, bool>(outputPath, "srt", false);
return new Tuple<string, string, bool>(outputPath, "srt", true);
}
return new Tuple<string, string, bool>(subtitleStream.Path, currentFormat, false);
return new Tuple<string, string, bool>(subtitleStream.Path, currentFormat, true);
}
private async Task<SubtitleTrackInfo> GetTrackInfo(Stream stream,