Merge branch 'master' into withcredentials

Conflicts:
	test/videojs-hls_test.js

@@ -24,7 +24,6 @@ module.exports = function(grunt) {
       dist: {
       dist: {
         nonull: true,
         nonull: true,
         src: ['src/videojs-hls.js',
         src: ['src/videojs-hls.js',
-              'src/async-queue.js',
               'src/flv-tag.js',
               'src/flv-tag.js',
               'src/exp-golomb.js',
               'src/exp-golomb.js',
               'src/h264-stream.js',
               'src/h264-stream.js',

-[![Build Status](https://travis-ci.org/videojs/videojs-contrib-hls.svg?branch=master)](https://travis-ci.org/videojs/videojs-contrib-hls)
-
 # video.js HLS Plugin
 # video.js HLS Plugin
 
 
 A video.js plugin that plays HLS video on platforms that don't support it but have Flash.
 A video.js plugin that plays HLS video on platforms that don't support it but have Flash.
 
 
+[![Build Status](https://travis-ci.org/videojs/videojs-contrib-hls.svg?branch=master)](https://travis-ci.org/videojs/videojs-contrib-hls)
+
 ## Getting Started
 ## Getting Started
 Download the [plugin](https://github.com/videojs/videojs-contrib-hls/releases). On your web page:
 Download the [plugin](https://github.com/videojs/videojs-contrib-hls/releases). On your web page:
 
 

@@ -10,11 +10,10 @@
   <script src="node_modules/video.js/dist/video-js/video.js"></script>
   <script src="node_modules/video.js/dist/video-js/video.js"></script>
 
 
   <!-- Media Sources plugin -->
   <!-- Media Sources plugin -->
-  <script src="node_modules/videojs-contrib-media-sources/videojs-media-sources.js"></script>
+  <script src="node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js"></script>
 
 
   <!-- HLS plugin -->
   <!-- HLS plugin -->
   <script src="src/videojs-hls.js"></script>
   <script src="src/videojs-hls.js"></script>
-  <script src="src/async-queue.js"></script>
 
 
   <!-- segment handling -->
   <!-- segment handling -->
   <script src="src/flv-tag.js"></script>
   <script src="src/flv-tag.js"></script>

 {
 {
   "name": "videojs-contrib-hls",
   "name": "videojs-contrib-hls",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "engines": {
   "engines": {
     "node": ">= 0.10.12"
     "node": ">= 0.10.12"
   },
   },
@@ -41,6 +41,6 @@
     "video.js": "^4.5"
     "video.js": "^4.5"
   },
   },
   "dependencies": {
   "dependencies": {
-    "videojs-contrib-media-sources": "git+https://github.com/videojs/videojs-contrib-media-sources.git"
+    "videojs-contrib-media-sources": "^0.2"
   }
   }
 }
 }

-(function(window, videojs, undefined) {
-  'use strict';
-  /**
-   * A queue object that manages tasks that should be processed
-   * serially but asynchronously. Loosely adapted from
-   * https://github.com/caolan/async#queue.
-   * @param worker {function} the callback to invoke with each value
-   * pushed onto the queue
-   * @return {object} an object with an array of `tasks` that remain to
-   * be processed and function `push` to add new tasks
-   */
-  videojs.hls.queue = function(worker) {
-    var
-      q = {
-        tasks: [],
-        running: false,
-        push: function(task) {
-          q.tasks.push(task);
-          if (!q.running) {
-            window.setTimeout(process, 0);
-            q.running = true;
-          }
-        }
-      },
-      process = function() {
-        var task;
-        if (q.tasks.length) {
-          task = q.tasks.shift();
-          worker.call(this, task);
-          window.setTimeout(process, 0);
-        } else {
-          q.running = false;
-        }
-      };
-    return q;
-  };
-})(window, window.videojs);

@@ -289,15 +289,6 @@ var
       mediaSource = new videojs.MediaSource(),
       mediaSource = new videojs.MediaSource(),
       segmentParser = new videojs.hls.SegmentParser(),
       segmentParser = new videojs.hls.SegmentParser(),
       player = this,
       player = this,
-
-      // async queue of Uint8Arrays to be appended to the SourceBuffer
-      tags = videojs.hls.queue(function(tag) {
-        player.hls.sourceBuffer.appendBuffer(tag, player);
-
-        if (player.hls.mediaIndex === player.hls.media.segments.length) {
-          mediaSource.endOfStream();
-        }
-      }),
       srcUrl,
       srcUrl,
 
 
       playlistXhr,
       playlistXhr,
@@ -385,11 +376,13 @@ var
       var currentTime = player.currentTime();
       var currentTime = player.currentTime();
       player.hls.mediaIndex = getMediaIndexByTime(player.hls.media, currentTime);
       player.hls.mediaIndex = getMediaIndexByTime(player.hls.media, currentTime);
 
 
+      // abort any segments still being decoded
+      player.hls.sourceBuffer.abort();
+
       // cancel outstanding requests and buffer appends
       // cancel outstanding requests and buffer appends
       if (segmentXhr) {
       if (segmentXhr) {
         segmentXhr.abort();
         segmentXhr.abort();
       }
       }
-      tags.tasks = [];
 
 
       // begin filling the buffer at the new position
       // begin filling the buffer at the new position
       fillBuffer(currentTime * 1000);
       fillBuffer(currentTime * 1000);
@@ -701,11 +694,18 @@ var
           // queue up the bytes to be appended to the SourceBuffer
           // queue up the bytes to be appended to the SourceBuffer
           // the queue gives control back to the browser between tags
           // the queue gives control back to the browser between tags
           // so that large segments don't cause a "hiccup" in playback
           // so that large segments don't cause a "hiccup" in playback
-          tags.push(segmentParser.getNextTag().bytes);
+
+          player.hls.sourceBuffer.appendBuffer(segmentParser.getNextTag().bytes,
+                                               player);
+
         }
         }
 
 
         player.hls.mediaIndex++;
         player.hls.mediaIndex++;
 
 
+        if (player.hls.mediaIndex === player.hls.media.segments.length) {
+          mediaSource.endOfStream();
+        }
+
         // figure out what stream the next segment should be downloaded from
         // figure out what stream the next segment should be downloaded from
         // with the updated bandwidth information
         // with the updated bandwidth information
         updateCurrentPlaylist();
         updateCurrentPlaylist();

-(function(window, queue, undefined) {
-  var
-    oldSetTimeout,
-    callbacks;
-  module('async queue', {
-    setup: function() {
-      oldSetTimeout = window.setTimeout;
-      callbacks = [];
-      window.setTimeout = function(callback) {
-        callbacks.push(callback);
-      };
-    },
-    teardown: function() {
-      window.setTimeout = oldSetTimeout;
-    }
-  });
-
-  test('runs tasks asynchronously', function() {
-    var
-      run = false,
-      q = queue(function() {
-        run = true;
-      });
-    q.push(1);
-    
-    ok(!run, 'tasks are not run immediately');
-
-    callbacks[0]();
-    ok(run, 'tasks are run asynchronously');
-  });
-
-  test('runs one task at a time', function() {
-    var q = queue(function() {});
-    q.push(1);
-    q.push(2);
-    q.push(3);
-    q.push(4);
-    q.push(5);
-
-    strictEqual(q.tasks.length, 5, 'all tasks are queued');
-    strictEqual(1, callbacks.length, 'one callback is registered');
-  });
-
-  test('tasks are scheduled until the queue is empty', function() {
-    var q = queue(function() {});
-    q.push(1);
-    q.push(2);
-
-    callbacks.shift()();
-    strictEqual(1, callbacks.length, 'the next task is scheduled');
-
-    callbacks.shift()();
-    strictEqual(1, callbacks.length, 'nothing is scheduled on an empty queue');
-  });
-
-  test('can be emptied at any time', function() {
-    var
-      runs = 0,
-      q = queue(function() {
-        runs++;
-      });
-    q.push(1);
-    q.push(2);
-
-    callbacks.shift()();
-    strictEqual(1, runs, 'task one is run');
-
-    q.tasks = [];
-    callbacks.shift()();
-    strictEqual(1, runs, 'the remaining tasks are cancelled');
-  });
-})(window, window.videojs.hls.queue);

@@ -40,7 +40,7 @@ module.exports = function(config) {
 
 
     files: [
     files: [
       '../node_modules/video.js/dist/video-js/video.js',
       '../node_modules/video.js/dist/video-js/video.js',
-      '../node_modules/videojs-contrib-media-sources/videojs-media-sources.js',
+      '../node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js',
       '../test/karma-qunit-shim.js',
       '../test/karma-qunit-shim.js',
       "../src/videojs-hls.js",
       "../src/videojs-hls.js",
       "../src/flv-tag.js",
       "../src/flv-tag.js",

@@ -35,7 +35,7 @@ module.exports = function(config) {
 
 
     files: [
     files: [
       '../node_modules/video.js/dist/video-js/video.js',
       '../node_modules/video.js/dist/video-js/video.js',
-      '../node_modules/videojs-contrib-media-sources/videojs-media-sources.js',
+      '../node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js',
       '../test/karma-qunit-shim.js',
       '../test/karma-qunit-shim.js',
       "../src/videojs-hls.js",
       "../src/videojs-hls.js",
       "../src/flv-tag.js",
       "../src/flv-tag.js",

@@ -37,9 +37,6 @@
   <script src="tsSegment-bc.js"></script>
   <script src="tsSegment-bc.js"></script>
   <script src="../src/bin-utils.js"></script>
   <script src="../src/bin-utils.js"></script>
 
 
-  <!-- async queue -->
-  <script src="../src/async-queue.js"></script>
-
   <!-- Test cases -->
   <!-- Test cases -->
   <script>
   <script>
   module('environment');
   module('environment');
@@ -54,7 +51,6 @@
   <script src="exp-golomb_test.js"></script>
   <script src="exp-golomb_test.js"></script>
   <script src="flv-tag_test.js"></script>
   <script src="flv-tag_test.js"></script>
   <script src="m3u8_test.js"></script>
   <script src="m3u8_test.js"></script>
-  <script src="async-queue_test.js"></script>
 </head>
 </head>
 <body>
 <body>
   <div id="qunit"></div>
   <div id="qunit"></div>

@@ -91,6 +91,7 @@ module('HLS', {
     oldSourceBuffer = window.videojs.SourceBuffer;
     oldSourceBuffer = window.videojs.SourceBuffer;
     window.videojs.SourceBuffer = function() {
     window.videojs.SourceBuffer = function() {
       this.appendBuffer = function() {};
       this.appendBuffer = function() {};
+      this.abort = function() {};
     };
     };
 
 
     // force native HLS to be ignored
     // force native HLS to be ignored
@@ -765,6 +766,7 @@ test('drops tags before the target timestamp when seeking', function() {
     this.appendBuffer = function(chunk) {
     this.appendBuffer = function(chunk) {
       bytes.push(chunk);
       bytes.push(chunk);
     };
     };
+    this.abort = function() {};
   };
   };
   // capture timeouts
   // capture timeouts
   window.setTimeout = function(callback) {
   window.setTimeout = function(callback) {
@@ -806,8 +808,10 @@ test('drops tags before the target timestamp when seeking', function() {
 });
 });
 
 
 test('clears pending buffer updates when seeking', function() {
 test('clears pending buffer updates when seeking', function() {
-  var bytes = [],
+  var
+    bytes = [],
     callbacks = [],
     callbacks = [],
+    aborts = 0,
     tags = [{ pts: 0, bytes: 0 }];
     tags = [{ pts: 0, bytes: 0 }];
 
 
   // mock out the parser and source buffer
   // mock out the parser and source buffer
@@ -816,6 +820,9 @@ test('clears pending buffer updates when seeking', function() {
     this.appendBuffer = function(chunk) {
     this.appendBuffer = function(chunk) {
       bytes.push(chunk);
       bytes.push(chunk);
     };
     };
+    this.abort = function() {
+      aborts++;
+    };
   };
   };
   // capture timeouts
   // capture timeouts
   window.setTimeout = function(callback) {
   window.setTimeout = function(callback) {
@@ -843,7 +850,7 @@ test('clears pending buffer updates when seeking', function() {
     callbacks.shift()();
     callbacks.shift()();
   }
   }
 
 
-  deepEqual(bytes, ['flv', 7], 'tags queued to be appended should be cancelled');
+  strictEqual(1, aborts, 'aborted pending buffer');
 });
 });
 
 
 test('playlist 404 should trigger MEDIA_ERR_NETWORK', function() {
 test('playlist 404 should trigger MEDIA_ERR_NETWORK', function() {
@@ -1129,9 +1136,12 @@ test('only reloads the active media playlist', function() {
   videojs.mediaSources[player.currentSrc()].trigger({
   videojs.mediaSources[player.currentSrc()].trigger({
     type: 'sourceopen'
     type: 'sourceopen'
   });
   });
+
   standardXHRResponse(requests[0]);
   standardXHRResponse(requests[0]);
   standardXHRResponse(requests[1]);
   standardXHRResponse(requests[1]);
 
 
+  videojs.mediaSources[player.currentSrc()].endOfStream = function() {};
+
   player.hls.selectPlaylist = function() {
   player.hls.selectPlaylist = function() {
     return player.hls.master.playlists[1];
     return player.hls.master.playlists[1];
   };
   };