Minor fixes to the fetcher

Increased the bandwidthVariance based on similar constraints in other projects
Added a fudge factor of half a frame to account for TimeRanges rounding
Don't try to cancel a fetch in the middle of an append operation

@@ -9,14 +9,15 @@
 var
 var
   // a fudge factor to apply to advertised playlist bitrates to account for
   // a fudge factor to apply to advertised playlist bitrates to account for
   // temporary flucations in client bandwidth
   // temporary flucations in client bandwidth
-  bandwidthVariance = 1.1,
+  bandwidthVariance = 1.2,
   Component = videojs.getComponent('Component'),
   Component = videojs.getComponent('Component'),
 
 
   // the amount of time to wait between checking the state of the buffer
   // the amount of time to wait between checking the state of the buffer
   bufferCheckInterval = 500,
   bufferCheckInterval = 500,
 
 
   keyFailed,
   keyFailed,
-  resolveUrl;
+  resolveUrl,
+  TIME_FUDGE_FACTOR = 1 / 60;
 
 
 // returns true if a key has failed to download within a certain amount of retries
 // returns true if a key has failed to download within a certain amount of retries
 keyFailed = function(key) {
 keyFailed = function(key) {
@@ -396,7 +397,7 @@ videojs.HlsHandler.prototype.setupSourceBuffer_ = function() {
 
 
   // transition the sourcebuffer to the ended state if we've hit the end of
   // transition the sourcebuffer to the ended state if we've hit the end of
   // the playlist
   // the playlist
-  this.sourceBuffer.addEventListener('updateend', function() {
+  this.sourceBuffer.addEventListener('updateend', function updateEndHandler() {
     var
     var
       segmentInfo = this.pendingSegment_,
       segmentInfo = this.pendingSegment_,
       segment,
       segment,
@@ -448,7 +449,8 @@ videojs.HlsHandler.prototype.setupSourceBuffer_ = function() {
       return;
       return;
     }
     }
 
 
-    if (timelineUpdates.length) {
+    if (timelineUpdates.length ||
+        segmentInfo.buffered.length !== this.tech_.buffered().length) {
       this.updateDuration(playlist);
       this.updateDuration(playlist);
       // check if it's time to download the next segment
       // check if it's time to download the next segment
       this.fillBuffer();
       this.fillBuffer();
@@ -540,6 +542,11 @@ videojs.HlsHandler.prototype.setCurrentTime = function(currentTime) {
     return currentTime;
     return currentTime;
   }
   }
 
 
+  // if we are in the middle of appending a segment, let it finish up
+  if (this.pendingSegment_ && this.pendingSegment_.buffered) {
+    return currentTime;
+  }
+
   this.lastSegmentLoaded_ = null;
   this.lastSegmentLoaded_ = null;
 
 
   // cancel outstanding requests and buffer appends
   // cancel outstanding requests and buffer appends
@@ -640,6 +647,7 @@ videojs.HlsHandler.prototype.cancelSegmentXhr = function() {
     this.segmentXhr_.abort();
     this.segmentXhr_.abort();
     this.segmentXhr_ = null;
     this.segmentXhr_ = null;
   }
   }
+
   // clear out the segment being processed
   // clear out the segment being processed
   this.pendingSegment_ = null;
   this.pendingSegment_ = null;
 };
 };
@@ -828,8 +836,8 @@ videojs.HlsHandler.prototype.findCurrentBuffered_ = function() {
   if (buffered && buffered.length) {
   if (buffered && buffered.length) {
     // Search for a range containing the play-head
     // Search for a range containing the play-head
     for (i = 0; i < buffered.length; i++) {
     for (i = 0; i < buffered.length; i++) {
-      if (buffered.start(i) <= currentTime &&
-          buffered.end(i) >= currentTime) {
+      if (buffered.start(i) - TIME_FUDGE_FACTOR <= currentTime &&
+          buffered.end(i) + TIME_FUDGE_FACTOR >= currentTime) {
         ranges = videojs.createTimeRanges(buffered.start(i), buffered.end(i));
         ranges = videojs.createTimeRanges(buffered.start(i), buffered.end(i));
         ranges.indexOf = i;
         ranges.indexOf = i;
         return ranges;
         return ranges;