Abort outstanding segment requests when seeking

If segment requests are not aborted, fillBuffer will detect an outstanding XHR and fail to download the target segment. This would force the user to click twice on the progress bar to get seek to "take" if their was a segment request in progress.

@@ -168,9 +168,12 @@ var
     };
     };
 
 
     player.on('seeking', function() {
     player.on('seeking', function() {
-      var seekValue = player.el().querySelector('.vjs-tech').vjs_getProperty('lastSeekedTime');
-      player.hls.mediaIndex = getMediaIndexByTime(player.hls.media, seekValue);
-      fillBuffer(seekValue * 1000);
+      var currentTime = player.currentTime();
+      player.hls.mediaIndex = getMediaIndexByTime(player.hls.media, currentTime);
+      if (segmentXhr) {
+        segmentXhr.abort();
+      }
+      fillBuffer(currentTime * 1000);
     });
     });
 
 
     /**
     /**
@@ -302,8 +305,10 @@ var
     /**
     /**
      * Determines whether there is enough video data currently in the buffer
      * Determines whether there is enough video data currently in the buffer
      * and downloads a new segment if the buffered time is less than the goal.
      * and downloads a new segment if the buffered time is less than the goal.
+     * @param offset (optional) {number} the offset into the downloaded segment
+     * to seek to, in milliseconds
      */
      */
-    fillBuffer = function(millisecond) {
+    fillBuffer = function(offset) {
       var
       var
         buffered = player.buffered(),
         buffered = player.buffered(),
         bufferedTime = 0,
         bufferedTime = 0,
@@ -342,20 +347,27 @@ var
       segmentXhr.onreadystatechange = function() {
       segmentXhr.onreadystatechange = function() {
         var playlist;
         var playlist;
 
 
-        if (segmentXhr.readyState === 4) {
+        if (this.readyState === 4) {
+          // the segment request is no longer outstanding
+          segmentXhr = null;
+
+          // stop processing if the request was aborted
+          if (!this.response) {
+            return;
+          }
+
           // calculate the download bandwidth
           // calculate the download bandwidth
           player.hls.segmentXhrTime = (+new Date()) - startTime;
           player.hls.segmentXhrTime = (+new Date()) - startTime;
-          player.hls.bandwidth = (segmentXhr.response.byteLength / player.hls.segmentXhrTime) * 8 * 1000;
+          player.hls.bandwidth = (this.response.byteLength / player.hls.segmentXhrTime) * 8 * 1000;
 
 
           // transmux the segment data from MP2T to FLV
           // transmux the segment data from MP2T to FLV
-          segmentParser.parseSegmentBinaryData(new Uint8Array(segmentXhr.response));
+          segmentParser.parseSegmentBinaryData(new Uint8Array(this.response));
 
 
           // handle intra-segment seeking, if requested //
           // handle intra-segment seeking, if requested //
-          // do not iterate over 0 index because it comes back with the end time //
-          if (millisecond !== undefined && typeof(millisecond) === "number") {
-            player.el().querySelector('.vjs-tech').vjs_setProperty('lastSeekedTime', getPtsByTime(segmentParser,millisecond)/1000);
+          if (offset !== undefined && typeof offset === "number") {
+            player.el().querySelector('.vjs-tech').vjs_setProperty('lastSeekedTime', getPtsByTime(segmentParser,offset)/1000);
             for (tagIndex = 0; tagIndex < segmentParser.getTags().length; tagIndex++) {
             for (tagIndex = 0; tagIndex < segmentParser.getTags().length; tagIndex++) {
-              if (segmentParser.getTags()[tagIndex].pts > millisecond) {
+              if (segmentParser.getTags()[tagIndex].pts > offset) {
                 break;
                 break;
               }
               }
               // we're seeking past this tag, so ignore it
               // we're seeking past this tag, so ignore it
@@ -367,7 +379,6 @@ var
             player.hls.sourceBuffer.appendBuffer(segmentParser.getNextTag().bytes, player);
             player.hls.sourceBuffer.appendBuffer(segmentParser.getNextTag().bytes, player);
           }
           }
 
 
-          segmentXhr = null;
           player.hls.mediaIndex++;
           player.hls.mediaIndex++;
 
 
           if (player.hls.mediaIndex === player.hls.media.segments.length) {
           if (player.hls.mediaIndex === player.hls.media.segments.length) {

+var grunt = require('grunt'),
+    extname = require('path').extname;
+
+grunt.file.recurse(process.cwd(), function(path) {
+  var json;
+  if (extname(path) === '.json') {
+    json = grunt.file.readJSON(path);
+    if (json.totalDuration) {
+      delete json.totalDuration;
+      grunt.file.write(path, JSON.stringify(json, null, '  '));
+    }
+  }
+});

@@ -473,6 +473,47 @@ test('ignores currentSrc if it doesn\'t have the "m3u8" extension', function() {
   strictEqual(xhrUrls.length, 0, 'no request is made');
   strictEqual(xhrUrls.length, 0, 'no request is made');
 });
 });
 
 
+test('cancels outstanding XHRs when seeking', function() {
+  var
+    aborted = false,
+    opened = 0;
+  player.hls('manifest/media.m3u8');
+  videojs.mediaSources[player.currentSrc()].trigger({
+    type: 'sourceopen'
+  });
+  player.hls.media = {
+    segments: [{
+      uri: '0.ts',
+      duration: 10
+    }, {
+      uri: '1.ts',
+      duration: 10
+    }]
+  };
+
+  // XHR requests will never complete
+  window.XMLHttpRequest = function() {
+    this.open = function() {
+      opened++;
+    };
+    this.send = function() {};
+    this.abort = function() {
+      aborted = true;
+      this.readyState = 4;
+      this.status = 0;
+      this.onreadystatechange();
+    };
+  };
+  // trigger a segment download request
+  player.trigger('timeupdate');
+  opened = 0;
+  // attempt to seek while the download is in progress
+  player.trigger('seeking');
+
+  ok(aborted, 'XHR aborted');
+  strictEqual(1, opened, 'opened new XHR');
+});
+
 
 
 module('segment controller', {
 module('segment controller', {
   setup: function() {
   setup: function() {