michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #629 from cvium/fix_subtitleencoder

Browse Source 
Fix subtitle converter misinterpreting 0 valued endTimeTicks
This commit is contained in:
Andrew Rabert 2019-01-20 11:35:20 -05:00 committed by GitHub
commit 3a6624f701
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
string inputFormat,
string outputFormat,
long startTimeTicks,
long? endTimeTicks,
long endTimeTicks,
bool preserveOriginalTimestamps,
CancellationToken cancellationToken)
{
@ -90,19 +90,17 @@ namespace MediaBrowser.MediaEncoding.Subtitles
return ms;
}
private void FilterEvents(SubtitleTrackInfo track, long startPositionTicks, long? endTimeTicks, bool preserveTimestamps)
private void FilterEvents(SubtitleTrackInfo track, long startPositionTicks, long endTimeTicks, bool preserveTimestamps)
{
// Drop subs that are earlier than what we're looking for
track.TrackEvents = track.TrackEvents
.SkipWhile(i => (i.StartPositionTicks - startPositionTicks) < 0 || (i.EndPositionTicks - startPositionTicks) < 0)
.ToArray();
if (endTimeTicks.HasValue)
if (endTimeTicks > 0)
{
long endTime = endTimeTicks.Value;
track.TrackEvents = track.TrackEvents
.TakeWhile(i => i.StartPositionTicks <= endTime)
.TakeWhile(i => i.StartPositionTicks <= endTimeTicks)
.ToArray();
}