Skip to content

Commit

Permalink
Account for segmentStartTime in vtt segments to handle live
Browse files Browse the repository at this point in the history
  • Loading branch information
Sanborn Hilland committed Aug 9, 2016
1 parent 2aef261 commit 8a3b5e5
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions lib/media/vtt_text_parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ shaka.media.VttTextParser = function(data, segmentStartTime, segmentEndTime) {
var ret = [];
for (var i = 1; i < blocks.length; i++) {
var lines = blocks[i].split('\n');
var cue = shaka.media.VttTextParser.parseCue_(lines);
var cue = shaka.media.VttTextParser.parseCue_(lines, segmentStartTime);
if (cue)
ret.push(cue);
}
Expand All @@ -60,10 +60,11 @@ shaka.media.VttTextParser = function(data, segmentStartTime, segmentEndTime) {
* Parses a text block into a Cue object.
*
* @param {!Array.<string>} text
* @param {?number} segmentStartTime
* @return {?TextTrackCue}
* @private
*/
shaka.media.VttTextParser.parseCue_ = function(text) {
shaka.media.VttTextParser.parseCue_ = function(text, segmentStartTime) {
// Skip empty blocks.
if (text.length == 1 && !text[0])
return null;
Expand All @@ -81,9 +82,9 @@ shaka.media.VttTextParser.parseCue_ = function(text) {

// Parse the times.
var parser = new shaka.util.TextParser(text[0]);
var start = shaka.media.VttTextParser.parseTime_(parser);
var start = shaka.media.VttTextParser.parseTime_(parser) + segmentStartTime;
var expect = parser.readRegex(/[ \t]+-->[ \t]+/g);
var end = shaka.media.VttTextParser.parseTime_(parser);
var end = shaka.media.VttTextParser.parseTime_(parser) + segmentStartTime;


if (start == null || expect == null || end == null) {
Expand Down

0 comments on commit 8a3b5e5

Please sign in to comment.