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

Merge pull request #2582 from Bond-009/subs

Browse Source 
Fix subtitles

(cherry picked from commit 6960f0af67d77210b75e2f54844538badeacbda6)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
dkanada 2020-03-15 00:00:55 +09:00 committed by Joshua M. Boniface
parent cb91595a24
commit 89fc5aa11a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,11 +183,12 @@ namespace MediaBrowser.MediaEncoding.Subtitles
private async Task<Stream> GetSubtitleStream(string path, MediaProtocol protocol, bool requiresCharset, CancellationToken cancellationToken)
{
if (requiresCharset)
using (var stream = await GetStream(path, protocol, cancellationToken).ConfigureAwait(false))
{
using (var stream = await GetStream(path, protocol, cancellationToken).ConfigureAwait(false))
if (requiresCharset)
{
var result = CharsetDetector.DetectFromStream(stream).Detected;
stream.Position = 0;
if (result != null)
{
@ -199,9 +200,9 @@ namespace MediaBrowser.MediaEncoding.Subtitles
return new MemoryStream(Encoding.UTF8.GetBytes(text));
}
}
}
return File.OpenRead(path);
return stream;
}
}
private async Task<SubtitleInfo> GetReadableFile(
@ -745,6 +746,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
{
Url = path,
CancellationToken = cancellationToken,
// Needed for seeking
BufferContent = true
};