Missing segments are skipped

In the long run, we'd like to switch variants if we encounter a missing segment but for now just dive ahead. Player errors are reserved for fatal conditions, so it doesn't make sense to trigger an error now that we have some error handling. For the moment, an error is exposed on the hls plugin but no player-level event is triggered.

@@ -484,7 +484,9 @@ var
             message: 'HLS segment request error at URL: ' + segmentUri,
             message: 'HLS segment request error at URL: ' + segmentUri,
             code: (this.status >= 500) ? 4 : 2
             code: (this.status >= 500) ? 4 : 2
           };
           };
-          player.trigger('error');
+
+          // try moving on to the next segment
+          player.hls.mediaIndex++
           return;
           return;
         }
         }
 
 

@@ -292,6 +292,28 @@ test('selects a playlist after segment downloads', function() {
   strictEqual(calls, 2, 'selects after additional segments');
   strictEqual(calls, 2, 'selects after additional segments');
 });
 });
 
 
+test('moves to the next segment if there is a network error', function() {
+  var mediaIndex;
+  player.hls('manifest/master.m3u8');
+  videojs.mediaSources[player.currentSrc()].trigger({
+    type: 'sourceopen'
+  });
+
+  // fail the next segment request
+  window.XMLHttpRequest = function() {
+    this.open = function() {};
+    this.send = function() {
+      this.readyState = 4;
+      this.status = 400;
+      this.onreadystatechange();
+    };
+  };
+  mediaIndex = player.hls.mediaIndex;
+  player.trigger('timeupdate');
+
+  strictEqual(mediaIndex + 1, player.hls.mediaIndex, 'media index is incremented');
+});
+
 test('updates the duration after switching playlists', function() {
 test('updates the duration after switching playlists', function() {
   var
   var
     calls = 0,
     calls = 0,
@@ -593,8 +615,6 @@ test('playlist 404 should trigger MEDIA_ERR_NETWORK', function() {
 });
 });
 
 
 test('segment 404 should trigger MEDIA_ERR_NETWORK', function () {
 test('segment 404 should trigger MEDIA_ERR_NETWORK', function () {
-  var errorTriggered = false;
-
   player.hls('manifest/media.m3u8');
   player.hls('manifest/media.m3u8');
 
 
   player.on('loadedmanifest', function () {
   player.on('loadedmanifest', function () {
@@ -610,22 +630,15 @@ test('segment 404 should trigger MEDIA_ERR_NETWORK', function () {
     };
     };
   });
   });
 
 
-  player.on('error', function () {
-    errorTriggered = true;
-  });
-
   videojs.mediaSources[player.currentSrc()].trigger({
   videojs.mediaSources[player.currentSrc()].trigger({
     type: 'sourceopen'
     type: 'sourceopen'
   });
   });
 
 
-  equal(true, errorTriggered, 'Missing Segment error event should trigger');
   ok(player.hls.error.message, 'an error message is available');
   ok(player.hls.error.message, 'an error message is available');
   equal(2, player.hls.error.code, 'Player error code should be set to MediaError.MEDIA_ERR_NETWORK');
   equal(2, player.hls.error.code, 'Player error code should be set to MediaError.MEDIA_ERR_NETWORK');
 });
 });
 
 
 test('segment 500 should trigger MEDIA_ERR_ABORTED', function () {
 test('segment 500 should trigger MEDIA_ERR_ABORTED', function () {
-  var errorTriggered = false;
-
   player.hls('manifest/media.m3u8');
   player.hls('manifest/media.m3u8');
 
 
   player.on('loadedmanifest', function () {
   player.on('loadedmanifest', function () {
@@ -641,15 +654,10 @@ test('segment 500 should trigger MEDIA_ERR_ABORTED', function () {
     };
     };
   });
   });
 
 
-  player.on('error', function () {
-    errorTriggered = true;
-  });
-
   videojs.mediaSources[player.currentSrc()].trigger({
   videojs.mediaSources[player.currentSrc()].trigger({
     type: 'sourceopen'
     type: 'sourceopen'
   });
   });
 
 
-  equal(true, errorTriggered, 'Missing Segment error event should trigger');
   ok(player.hls.error.message, 'an error message is available');
   ok(player.hls.error.message, 'an error message is available');
   equal(4, player.hls.error.code, 'Player error code should be set to MediaError.MEDIA_ERR_ABORTED');
   equal(4, player.hls.error.code, 'Player error code should be set to MediaError.MEDIA_ERR_ABORTED');
 });
 });