alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-02 13:58:29 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Clean up ConvertSubtitles

Browse Source
This commit is contained in:
Bond_009
2026-05-30 21:42:19 +02:00
parent 941298ee81
commit 2b6da44815
1 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,34 +79,18 @@ namespace MediaBrowser.MediaEncoding.Subtitles
string outputFormat,
long startTimeTicks,
long endTimeTicks,
bool preserveOriginalTimestamps,
CancellationToken cancellationToken)
bool preserveOriginalTimestamps)
{
var ms = new MemoryStream();
var subtitle = Subtitle.Parse(stream, Path.GetExtension(inputInfo.Path));
try
{
var subtitle = Subtitle.Parse(stream, Path.GetExtension(inputInfo.Path));
FilterEvents(subtitle, startTimeTicks, endTimeTicks, preserveOriginalTimestamps);
FilterEvents(subtitle, startTimeTicks, endTimeTicks, preserveOriginalTimestamps);
var formatter = GetWriter(outputFormat);
var formatter = GetWriter(outputFormat);
var text = formatter.ToText(subtitle, "untitled");
var bytes = Encoding.UTF8.GetBytes(text);
var text = formatter.ToText(subtitle, "untitled");
using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
{
writer.Write(text);
}
ms.Position = 0;
}
catch
{
ms.Dispose();
throw;
}
return ms;
return new MemoryStream(bytes, 0, bytes.Length, false, true);
}
internal void FilterEvents(Subtitle track, long startPositionTicks, long endTimeTicks, bool preserveTimestamps)
@@ -163,7 +147,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
using (stream)
{
return ConvertSubtitles(stream, info, outputFormat, startTimeTicks, endTimeTicks, preserveOriginalTimestamps, cancellationToken);
return ConvertSubtitles(stream, info, outputFormat, startTimeTicks, endTimeTicks, preserveOriginalTimestamps);
}
}