Merge branch 'hotfix/stream-ended' of https://github.com/videojs/videojs-contrib…

…-hls into reorg-w-114 close #114 closes #115 Conflicts: src/videojs-hls.js

Merge branch 'hotfix/stream-ended' of https://github.com/videojs/videojs-contrib…
…-hls into reorg-w-114 close #114 closes #115 Conflicts: src/videojs-hls.js
Steve Heffernan
Showing 2 changed files with 112 additions and 133 deletions
src/videojs-hls.js
test/videojs-hls_test.js
--- a/src/videojs-hls.js
View file @21c692d
+++ b/src/videojs-hls.js
View file @21c692d
@@ -158,6 +158,19 @@ videojs.Hls.prototype.handleSourceOpen = function() {
  });
 };
+/**
+ * Reset the mediaIndex if play() is called after the video has
+ * ended.
+ */
+videojs.Hls.prototype.play = function() {
+  if (this.ended()) {
+    this.mediaIndex = 0;
+  }
+  // delegate back to the Flash implementation
+  return videojs.Flash.prototype.play.apply(this, arguments);
+};
 videojs.Hls.prototype.duration = function() {
  var playlists = this.playlists;
  if (playlists) {
@@ -458,7 +471,9 @@ videojs.Hls.prototype.drainBuffer = function(event) {
  // we're done processing this segment
  segmentBuffer.shift();
-  if (mediaIndex === playlist.segments.length) {
+  // transition the sourcebuffer to the ended state if we've hit the end of
+  // the playlist
+  if (mediaIndex + 1 === playlist.segments.length) {
    this.mediaSource.endOfStream();
  }
 };
--- a/test/videojs-hls_test.js
View file @21c692d
+++ b/test/videojs-hls_test.js
View file @21c692d
@@ -51,10 +51,18 @@ var
    tech.vjs_getProperty = function() {};
    tech.vjs_setProperty = function() {};
    tech.vjs_src = function() {};
+    tech.vjs_play = function() {};
    videojs.Flash.onReady(tech.id);
    return player;
  },
+  openMediaSource = function(player) {
+    player.hls.mediaSource.trigger({
+      type: 'sourceopen'
+    });
+    // endOfStream triggers an exception if flash isn't available
+    player.hls.mediaSource.endOfStream = function() {};
+  },
  standardXHRResponse = function(request) {
    if (!request.url) {
      return;
@@ -160,9 +168,7 @@ test('starts playing if autoplay is specified', function() {
    src: 'manifest/playlist.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  strictEqual(1, plays, 'play was called');
@@ -179,9 +185,7 @@ test('creates a PlaylistLoader on init', function() {
    src:'manifest/playlist.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  ok(loadedmetadata, 'loadedmetadata fires');
  ok(player.hls.playlists.master, 'set the master playlist');
@@ -204,9 +208,7 @@ test('sets the duration if one is available on the playlist', function() {
    src: 'manifest/media.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  strictEqual(calls, 1, 'duration is set');
@@ -226,9 +228,7 @@ test('calculates the duration if needed', function() {
    src: 'http://example.com/manifest/missingExtinf.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  strictEqual(durations.length, 1, 'duration is set');
@@ -245,9 +245,7 @@ test('starts downloading a segment on loadedmetadata', function() {
  player.buffered = function() {
    return videojs.createTimeRange(0, 0);
  };
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  standardXHRResponse(requests[1]);
@@ -263,9 +261,7 @@ test('recognizes absolute URIs and requests them unmodified', function() {
    src: 'manifest/absoluteUris.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  standardXHRResponse(requests[1]);
@@ -279,9 +275,7 @@ test('recognizes domain-relative URLs', function() {
    src: 'manifest/domainUris.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  standardXHRResponse(requests[1]);
@@ -297,9 +291,7 @@ test('re-initializes the tech for each source', function() {
    src: 'manifest/master.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  firstPlaylists = player.hls.playlists;
  firstMSE = player.hls.mediaSource;
@@ -307,9 +299,7 @@ test('re-initializes the tech for each source', function() {
    src: 'manifest/master.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  secondPlaylists = player.hls.playlists;
  secondMSE = player.hls.mediaSource;
@@ -326,9 +316,7 @@ test('triggers an error when a master playlist request errors', function() {
    src: 'manifest/master.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  requests.pop().respond(500);
  ok(player.error(), 'an error is triggered');
@@ -341,9 +329,7 @@ test('downloads media playlists after loading the master', function() {
    src: 'manifest/master.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  standardXHRResponse(requests[1]);
@@ -367,9 +353,7 @@ test('timeupdates do not check to fill the buffer until a media playlist is read
    src: 'manifest/media.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  player.trigger('timeupdate');
  strictEqual(1, requests.length, 'one request was made');
@@ -381,9 +365,7 @@ test('calculates the bandwidth after downloading a segment', function() {
    src: 'manifest/media.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  standardXHRResponse(requests[1]);
@@ -405,9 +387,7 @@ test('selects a playlist after segment downloads', function() {
    calls++;
    return player.hls.playlists.master.playlists[0];
  };
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  standardXHRResponse(requests[1]);
@@ -433,9 +413,7 @@ test('moves to the next segment if there is a network error', function() {
    src: 'manifest/master.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  standardXHRResponse(requests[1]);
@@ -468,9 +446,7 @@ test('updates the duration after switching playlists', function() {
      calls++;
    }
  };
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  standardXHRResponse(requests[1]);
@@ -490,9 +466,7 @@ test('downloads additional playlists if required', function() {
    src: 'manifest/master.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  standardXHRResponse(requests[1]);
@@ -531,9 +505,7 @@ test('selects a playlist below the current bandwidth', function() {
    src: 'manifest/master.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
@@ -556,9 +528,7 @@ test('raises the minimum bitrate for a stream proportionially', function() {
    src: 'manifest/master.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
@@ -581,9 +551,7 @@ test('uses the lowest bitrate if no other is suitable', function() {
    src: 'manifest/master.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
@@ -605,9 +573,7 @@ test('selects the correct rendition by player dimensions', function() {
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
@@ -644,9 +610,7 @@ test('does not download the next segment if the buffer is full', function() {
  player.buffered = function() {
    return videojs.createTimeRange(0, currentTime + videojs.Hls.GOAL_BUFFER_LENGTH);
  };
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
@@ -660,9 +624,7 @@ test('downloads the next segment if the buffer is getting low', function() {
    src: 'manifest/media.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  standardXHRResponse(requests[1]);
@@ -691,9 +653,7 @@ test('stops downloading segments at the end of the playlist', function() {
    src: 'manifest/media.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  requests = [];
  player.hls.mediaIndex = 4;
@@ -707,9 +667,7 @@ test('only makes one segment request at a time', function() {
    src: 'manifest/media.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests.pop());
  player.trigger('timeupdate');
@@ -723,9 +681,7 @@ test('cancels outstanding XHRs when seeking', function() {
    src: 'manifest/media.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  player.hls.media = {
    segments: [{
@@ -764,9 +720,7 @@ test('flushes the parser after each segment', function() {
    src: 'manifest/media.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  standardXHRResponse(requests[1]);
@@ -794,9 +748,7 @@ test('drops tags before the target timestamp when seeking', function() {
    src: 'manifest/media.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  standardXHRResponse(requests[1]);
@@ -836,9 +788,7 @@ test('calls abort() on the SourceBuffer before seeking', function() {
    src: 'manifest/media.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  standardXHRResponse(requests[1]);
@@ -863,9 +813,7 @@ test('playlist 404 should trigger MEDIA_ERR_NETWORK', function() {
    src: 'manifest/media.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  requests.pop().respond(404);
  equal(errorTriggered,
@@ -883,9 +831,7 @@ test('segment 404 should trigger MEDIA_ERR_NETWORK', function () {
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  requests[1].respond(404);
@@ -899,9 +845,7 @@ test('segment 500 should trigger MEDIA_ERR_ABORTED', function () {
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
  requests[1].respond(500);
@@ -914,9 +858,7 @@ test('duration is Infinity for live playlists', function() {
    src: 'http://example.com/manifest/missingEndlist.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests[0]);
@@ -929,9 +871,7 @@ test('updates the media index when a playlist reloads', function() {
    src: 'http://example.com/live-updating.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  requests[0].respond(200, null,
                      '#EXTM3U\n' +
@@ -971,9 +911,7 @@ test('mediaIndex is zero before the first segment loads', function() {
    src: 'http://example.com/first-seg-load.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  strictEqual(player.hls.mediaIndex, 0, 'mediaIndex is zero');
 });
@@ -983,9 +921,7 @@ test('reloads out-of-date live playlists when switching variants', function() {
    src: 'http://example.com/master.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  player.hls.master = {
    playlists: [{
@@ -1026,9 +962,7 @@ test('if withCredentials option is used, withCredentials is set on the XHR objec
    src: 'http://example.com/media.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  ok(requests[0].withCredentials, "with credentials should be set to true if that option is passed in");
 });
@@ -1038,9 +972,7 @@ test('does not break if the playlist has no segments', function() {
    type: 'application/vnd.apple.mpegurl'
  });
  try {
-    player.hls.mediaSource.trigger({
+    openMediaSource(player);
-      type: 'sourceopen'
-    });
    requests[0].respond(200, null,
                        '#EXTM3U\n' +
                        '#EXT-X-PLAYLIST-TYPE:VOD\n' +
@@ -1060,9 +992,7 @@ test('waits until the buffer is empty before appending bytes at a discontinuity'
    src: 'disc.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  player.currentTime = function() { return currentTime; };
  player.buffered = function() {
    return videojs.createTimeRange(0, bufferEnd);
@@ -1109,9 +1039,7 @@ test('clears the segment buffer on seek', function() {
    src: 'disc.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  oldCurrentTime = player.currentTime;
  player.currentTime = function(time) {
    if (time !== undefined) {
@@ -1158,9 +1086,7 @@ test('resets the switching algorithm if a request times out', function() {
    src: 'master.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  standardXHRResponse(requests.shift()); // master
  standardXHRResponse(requests.shift()); // media.m3u8
  // simulate a segment timeout
@@ -1181,9 +1107,7 @@ test('disposes the playlist loader', function() {
    src: 'manifest/master.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  loaderDispose = player.hls.playlists.dispose;
  player.hls.playlists.dispose = function() {
    disposes++;
@@ -1232,9 +1156,7 @@ test('tracks the bytes downloaded', function() {
    src: 'http://example.com/media.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  strictEqual(player.hls.bytesReceived, 0, 'no bytes received');
@@ -1270,9 +1192,7 @@ test('re-emits mediachange events', function() {
    src: 'http://example.com/media.m3u8',
    type: 'application/vnd.apple.mpegurl'
  });
-  player.hls.mediaSource.trigger({
+  openMediaSource(player);
-    type: 'sourceopen'
-  });
  player.hls.playlists.trigger('mediachange');
  strictEqual(mediaChanges, 1, 'fired mediachange');
@@ -1302,4 +1222,48 @@ test('can be disposed before finishing initialization', function() {
  }
 });
+test('calls ended() on the media source at the end of a playlist', function() {
+  var endOfStreams = 0;
+  player.src({
+    src: 'http://example.com/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
+  openMediaSource(player);
+  player.hls.mediaSource.endOfStream = function() {
+    endOfStreams++;
+  };
+  // playlist response
+  requests.shift().respond(200, null,
+                           '#EXTM3U\n' +
+                           '#EXTINF:10,\n' +
+                           '0.ts\n' +
+                           '#EXT-X-ENDLIST\n');
+  // segment response
+  requests[0].response = new ArrayBuffer(17);
+  requests.shift().respond(200, null, '');
+  strictEqual(endOfStreams, 1, 'ended media source');
+});
+test('calling play() at the end of a video resets the media index', function() {
+  player.src({
+    src: 'http://example.com/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
+  openMediaSource(player);
+  requests.shift().respond(200, null,
+                           '#EXTM3U\n' +
+                           '#EXTINF:10,\n' +
+                           '0.ts\n' +
+                           '#EXT-X-ENDLIST\n');
+  standardXHRResponse(requests.shift());
+  strictEqual(player.hls.mediaIndex, 1, 'index is 1 after the first segment');
+  player.hls.ended = function() {
+    return true;
+  };
+  player.play();
+  strictEqual(player.hls.mediaIndex, 0, 'index is 1 after the first segment');
+});
 })(window, window.videojs);