Merge pull request #231 from videojs/bugfix/segment-skip

Fixing bug that started playback at 2nd segment

@@ -666,7 +666,7 @@ videojs.Hls.prototype.drainBuffer = function(event) {
     segmentOffset,
     segmentOffset,
     segmentBuffer = this.segmentBuffer_;
     segmentBuffer = this.segmentBuffer_;
 
 
-  if (!segmentBuffer.length) {
+  if (!segmentBuffer.length || !this.sourceBuffer) {
     return;
     return;
   }
   }
 
 

@@ -1724,6 +1724,46 @@ test('calling play() at the end of a video resets the media index', function() {
   strictEqual(player.hls.mediaIndex, 0, 'index is 1 after the first segment');
   strictEqual(player.hls.mediaIndex, 0, 'index is 1 after the first segment');
 });
 });
 
 
+test('drainBuffer will not proceed with empty source buffer', function() {
+  var oldMedia, newMedia, compareBuffer;
+  player.src({
+    src: 'https://example.com/encrypted-media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
+  openMediaSource(player);
+
+  oldMedia = player.hls.playlists.media;
+  newMedia = {segments: [{
+    key: {
+      'retries': 5
+    },
+    uri: 'http://media.example.com/fileSequence52-A.ts'
+  }, {
+    key: {
+      'method': 'AES-128',
+      'uri': 'https://priv.example.com/key.php?r=53'
+    },
+    uri: 'http://media.example.com/fileSequence53-B.ts'
+  }]};
+  player.hls.playlists.media = function() {
+    return newMedia;
+  };
+
+  player.hls.sourceBuffer = undefined;
+  compareBuffer = [{mediaIndex: 0, playlist: newMedia, offset: 0, bytes: [0,0,0]}];
+  player.hls.segmentBuffer_ = [{mediaIndex: 0, playlist: newMedia, offset: 0, bytes: [0,0,0]}];
+
+  player.hls.drainBuffer();
+
+  /* Normally, drainBuffer() calls segmentBuffer.shift(), removing a segment from the stack.
+   * Comparing two buffers to ensure no segment was popped verifies that we returned early
+   * from drainBuffer() because sourceBuffer was empty.
+   */
+  deepEqual(player.hls.segmentBuffer_, compareBuffer, 'playlist remains unchanged');
+
+  player.hls.playlists.media = oldMedia;
+});
+
 test('calling fetchKeys() when a new playlist is loaded will create an XHR', function() {
 test('calling fetchKeys() when a new playlist is loaded will create an XHR', function() {
   player.src({
   player.src({
     src: 'https://example.com/encrypted-media.m3u8',
     src: 'https://example.com/encrypted-media.m3u8',