aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2014-08-29 07:41:37 -0400
committerLuke <luke.pulverenti@gmail.com>2014-08-29 07:41:37 -0400
commit1e2e51d35b01f5e88c21991b2c8a4c630945cd5f (patch)
treefef6a2fc25890a81b1ebe35c3e1212f9c62ff1be
parent7e636a977a47f67af9bebfcbb6ebc89035ad91bd (diff)
parent96f8132f6e1c316b2d9fcc06fddea80f89e2c645 (diff)
Merge pull request #905 from faush01/master
make sure start and end times are different
-rw-r--r--MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
index 228f0beb1..fa53e4d13 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
@@ -18,7 +18,16 @@ namespace MediaBrowser.MediaEncoding.Subtitles
{
cancellationToken.ThrowIfCancellationRequested();
- writer.WriteLine(@"{0:hh\:mm\:ss\.fff} --> {1:hh\:mm\:ss\.fff}", TimeSpan.FromTicks(trackEvent.StartPositionTicks), TimeSpan.FromTicks(trackEvent.EndPositionTicks));
+ TimeSpan startTime = TimeSpan.FromTicks(trackEvent.StartPositionTicks);
+ TimeSpan endTime = TimeSpan.FromTicks(trackEvent.EndPositionTicks);
+
+ // make sure the start and end times are different and seqential
+ if (endTime.TotalMilliseconds <= startTime.TotalMilliseconds)
+ {
+ endTime = startTime.Add(TimeSpan.FromMilliseconds(1));
+ }
+
+ writer.WriteLine(@"{0:hh\:mm\:ss\.fff} --> {1:hh\:mm\:ss\.fff}", startTime, endTime);
var text = trackEvent.Text;