mirror of https://github.com/jellyfin/jellyfin.git
Merge pull request #629 from cvium/fix_subtitleencoder
Fix subtitle converter misinterpreting 0 valued endTimeTicks
This commit is contained in:
commit
3a6624f701
|
@ -62,7 +62,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
string inputFormat,
|
string inputFormat,
|
||||||
string outputFormat,
|
string outputFormat,
|
||||||
long startTimeTicks,
|
long startTimeTicks,
|
||||||
long? endTimeTicks,
|
long endTimeTicks,
|
||||||
bool preserveOriginalTimestamps,
|
bool preserveOriginalTimestamps,
|
||||||
CancellationToken cancellationToken)
|
CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
|
@ -90,19 +90,17 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
return ms;
|
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
|
// Drop subs that are earlier than what we're looking for
|
||||||
track.TrackEvents = track.TrackEvents
|
track.TrackEvents = track.TrackEvents
|
||||||
.SkipWhile(i => (i.StartPositionTicks - startPositionTicks) < 0 || (i.EndPositionTicks - startPositionTicks) < 0)
|
.SkipWhile(i => (i.StartPositionTicks - startPositionTicks) < 0 || (i.EndPositionTicks - startPositionTicks) < 0)
|
||||||
.ToArray();
|
.ToArray();
|
||||||
|
|
||||||
if (endTimeTicks.HasValue)
|
if (endTimeTicks > 0)
|
||||||
{
|
{
|
||||||
long endTime = endTimeTicks.Value;
|
|
||||||
|
|
||||||
track.TrackEvents = track.TrackEvents
|
track.TrackEvents = track.TrackEvents
|
||||||
.TakeWhile(i => i.StartPositionTicks <= endTime)
|
.TakeWhile(i => i.StartPositionTicks <= endTimeTicks)
|
||||||
.ToArray();
|
.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue