From e13e2ae8be16c1f73f0723cf008a712a5d7d4cbf Mon Sep 17 00:00:00 2001
From: Gary Katsevman <git@gkatsev.com>
Date: Wed, 7 May 2014 18:29:10 -0400
Subject: [PATCH 01/14] initial plugin->tech conversion

---
 example.html            |  10 +-
 src/aac-stream.js       |   4 +-
 src/bin-utils.js        |   2 +-
 src/exp-golomb.js       |   2 +-
 src/flv-tag.js          |   4 +-
 src/h264-stream.js      |   8 +-
 src/m3u8/m3u8-parser.js |   2 +-
 src/playlist-loader.js  |   8 +-
 src/segment-parser.js   |  12 +-
 src/stream.js           |   2 +-
 src/videojs-hls.js      | 298 +++++++++++++++++++++-------------------
 11 files changed, 186 insertions(+), 166 deletions(-)

diff --git a/example.html b/example.html
index 7582e0deb..fc9ff7780 100644
--- a/example.html
+++ b/example.html
@@ -7,7 +7,7 @@
   <link href="node_modules/video.js/dist/video-js/video-js.css" rel="stylesheet">
   
   <!-- video.js -->
-  <script src="node_modules/video.js/dist/video-js/video.js"></script>
+  <script src="node_modules/video.js/dist/video-js/video.dev.js"></script>
 
   <!-- Media Sources plugin -->
   <script src="node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js"></script>
@@ -31,7 +31,7 @@
   <!-- bipbop -->
   <!-- <script src="test/tsSegment.js"></script> -->
   <!-- bunnies -->
-  <script src="test/tsSegment-bc.js"></script>
+  <!--<script src="test/tsSegment-bc.js"></script>-->
 
   <style>
     body {
@@ -63,10 +63,12 @@
   <script>
     videojs.options.flash.swf = 'node_modules/video.js/dist/video-js/video-js.swf';
     // initialize the player
-    var player = videojs('video');
+    var player = videojs('video', {
+      techOrder: ['hls']
+    });
 
     // initialize the plugin
-    player.hls();
+    //player.hls()
   </script>
 </body>
 </html>
diff --git a/src/aac-stream.js b/src/aac-stream.js
index 0a1ea6ac2..e1e30539b 100644
--- a/src/aac-stream.js
+++ b/src/aac-stream.js
@@ -8,7 +8,7 @@
 
 (function(window) {
 var
-  FlvTag = window.videojs.hls.FlvTag,
+  FlvTag = window.videojs.Hls.FlvTag,
   adtsSampleingRates = [
     96000, 88200,
     64000, 48000,
@@ -17,7 +17,7 @@ var
     16000, 12000
   ];
 
-window.videojs.hls.AacStream = function() {
+window.videojs.Hls.AacStream = function() {
   var
     next_pts, // :uint
     pts_offset, // :int
diff --git a/src/bin-utils.js b/src/bin-utils.js
index fe84ad6b8..a2fec16af 100644
--- a/src/bin-utils.js
+++ b/src/bin-utils.js
@@ -29,5 +29,5 @@
     }
   };
 
-  window.videojs.hls.utils = module;
+  window.videojs.Hls.utils = module;
 })(this);
diff --git a/src/exp-golomb.js b/src/exp-golomb.js
index 2baa9baaf..9c2b0be9e 100644
--- a/src/exp-golomb.js
+++ b/src/exp-golomb.js
@@ -4,7 +4,7 @@
  * Parser for exponential Golomb codes, a variable-bitwidth number encoding
  * scheme used by h264.
  */
-window.videojs.hls.ExpGolomb = function(workingData) {
+window.videojs.Hls.ExpGolomb = function(workingData) {
   var
     // the number of bytes left to examine in workingData
     workingBytesAvailable = workingData.byteLength,
diff --git a/src/flv-tag.js b/src/flv-tag.js
index f044d0155..5232cd2a9 100644
--- a/src/flv-tag.js
+++ b/src/flv-tag.js
@@ -1,9 +1,9 @@
 (function(window) {
 
 window.videojs = window.videojs || {};
-window.videojs.hls = window.videojs.hls || {};
+window.videojs.Hls = window.videojs.Hls || {};
 
-var hls = window.videojs.hls;
+var hls = window.videojs.Hls;
 
 // (type:uint, extraData:Boolean = false) extends ByteArray
 hls.FlvTag = function(type, extraData) {
diff --git a/src/h264-stream.js b/src/h264-stream.js
index bb1995a93..7e6da9af5 100644
--- a/src/h264-stream.js
+++ b/src/h264-stream.js
@@ -8,8 +8,8 @@
 
 (function(window) {
   var
-    ExpGolomb = window.videojs.hls.ExpGolomb,
-    FlvTag = window.videojs.hls.FlvTag,
+    ExpGolomb = window.videojs.Hls.ExpGolomb,
+    FlvTag = window.videojs.Hls.FlvTag,
 
     H264ExtraData = function() {
       this.sps = []; // :Array
@@ -234,7 +234,7 @@
    * an h264 stream. Exactly one byte.
    */
   // incomplete, see Table 7.1 of ITU-T H.264 for 12-32
-  window.videojs.hls.NALUnitType = NALUnitType = {
+  window.videojs.Hls.NALUnitType = NALUnitType = {
     unspecified: 0,
     slice_layer_without_partitioning_rbsp_non_idr: 1,
     slice_data_partition_a_layer_rbsp: 2,
@@ -249,7 +249,7 @@
     end_of_stream_rbsp: 11
   };
 
-  window.videojs.hls.H264Stream = function() {
+  window.videojs.Hls.H264Stream = function() {
     var
       next_pts, // :uint;
       next_dts, // :uint;
diff --git a/src/m3u8/m3u8-parser.js b/src/m3u8/m3u8-parser.js
index cba0eca74..286349373 100644
--- a/src/m3u8/m3u8-parser.js
+++ b/src/m3u8/m3u8-parser.js
@@ -32,7 +32,7 @@
       }
       return result;
     },
-    Stream = videojs.hls.Stream,
+    Stream = videojs.Hls.Stream,
     LineStream,
     ParseStream,
     Parser;
diff --git a/src/playlist-loader.js b/src/playlist-loader.js
index e5f50b81e..87ea415cd 100644
--- a/src/playlist-loader.js
+++ b/src/playlist-loader.js
@@ -5,8 +5,8 @@
 (function(window, videojs) {
   'use strict';
   var
-    resolveUrl = videojs.hls.resolveUrl,
-    xhr = videojs.hls.xhr,
+    resolveUrl = videojs.Hls.resolveUrl,
+    xhr = videojs.Hls.xhr,
 
     /**
      * Returns a new master playlist that is the result of merging an
@@ -231,7 +231,7 @@
         return loader.trigger('loadedmetadata');
       });
     };
-  PlaylistLoader.prototype = new videojs.hls.Stream();
+  PlaylistLoader.prototype = new videojs.Hls.Stream();
 
-  videojs.hls.PlaylistLoader = PlaylistLoader;
+  videojs.Hls.PlaylistLoader = PlaylistLoader;
 })(window, window.videojs);
diff --git a/src/segment-parser.js b/src/segment-parser.js
index 52297b97d..b6f7f0a02 100644
--- a/src/segment-parser.js
+++ b/src/segment-parser.js
@@ -1,9 +1,9 @@
 (function(window) {
   var
     videojs = window.videojs,
-    FlvTag = videojs.hls.FlvTag,
-    H264Stream = videojs.hls.H264Stream,
-    AacStream = videojs.hls.AacStream,
+    FlvTag = videojs.Hls.FlvTag,
+    H264Stream = videojs.Hls.H264Stream,
+    AacStream = videojs.Hls.AacStream,
     MP2T_PACKET_LENGTH,
     STREAM_TYPES;
 
@@ -11,7 +11,7 @@
    * An object that incrementally transmuxes MPEG2 Trasport Stream
    * chunks into an FLV.
    */
-  videojs.hls.SegmentParser = function() {
+  videojs.Hls.SegmentParser = function() {
     var
       self = this,
       parseTSPacket,
@@ -432,8 +432,8 @@
   };
 
   // MPEG2-TS constants
-  videojs.hls.SegmentParser.MP2T_PACKET_LENGTH = MP2T_PACKET_LENGTH = 188;
-  videojs.hls.SegmentParser.STREAM_TYPES = STREAM_TYPES = {
+  videojs.Hls.SegmentParser.MP2T_PACKET_LENGTH = MP2T_PACKET_LENGTH = 188;
+  videojs.Hls.SegmentParser.STREAM_TYPES = STREAM_TYPES = {
     h264: 0x1b,
     adts: 0x0f
   };
diff --git a/src/stream.js b/src/stream.js
index a21a9742f..7b6502a00 100644
--- a/src/stream.js
+++ b/src/stream.js
@@ -65,5 +65,5 @@
     });
   };
 
-  videojs.hls.Stream = Stream;
+  videojs.Hls.Stream = Stream;
 })(window.videojs);
diff --git a/src/videojs-hls.js b/src/videojs-hls.js
index 41c2641f5..568fb840f 100644
--- a/src/videojs-hls.js
+++ b/src/videojs-hls.js
@@ -8,28 +8,6 @@
 
 (function(window, videojs, document, undefined) {
 
-videojs.hls = {
-  /**
-   * Whether the browser has built-in HLS support.
-   */
-  supportsNativeHls: (function() {
-    var
-      video = document.createElement('video'),
-      xMpegUrl,
-      vndMpeg;
-
-    // native HLS is definitely not supported if HTML5 video isn't
-    if (!videojs.Html5.isSupported()) {
-      return false;
-    }
-
-    xMpegUrl = video.canPlayType('application/x-mpegURL');
-    vndMpeg = video.canPlayType('application/vnd.apple.mpegURL');
-    return (/probably|maybe/).test(xMpegUrl) ||
-      (/probably|maybe/).test(vndMpeg);
-  })()
-};
-
 var
 
   // the desired length of video to maintain in the buffer, in seconds
@@ -95,60 +73,7 @@ var
     }
   },
 
-  /**
-   * Creates and sends an XMLHttpRequest.
-   * @param options {string | object} if this argument is a string, it
-   * is intrepreted as a URL and a simple GET request is
-   * inititated. If it is an object, it should contain a `url`
-   * property that indicates the URL to request and optionally a
-   * `method` which is the type of HTTP request to send.
-   * @param callback (optional) {function} a function to call when the
-   * request completes. If the request was not successful, the first
-   * argument will be falsey.
-   * @return {object} the XMLHttpRequest that was initiated.
-   */
-  xhr = videojs.hls.xhr = function(url, callback) {
-    var
-      options = {
-        method: 'GET'
-      },
-      request;
-
-    if (typeof callback !== 'function') {
-      callback = function() {};
-    }
-
-    if (typeof url === 'object') {
-      options = videojs.util.mergeOptions(options, url);
-      url = options.url;
-    }
-
-    request = new window.XMLHttpRequest();
-    request.open(options.method, url);
-
-    if (options.responseType) {
-      request.responseType = options.responseType;
-    }
-    if (options.withCredentials) {
-      request.withCredentials = true;
-    }
-
-    request.onreadystatechange = function() {
-      // wait until the request completes
-      if (this.readyState !== 4) {
-        return;
-      }
-
-      // request error
-      if (this.status >= 400 || this.status === 0) {
-        return callback.call(this, true, url);
-      }
-
-      return callback.call(this, false, url);
-    };
-    request.send(null);
-    return request;
-  },
+  xhr,
 
   /**
    * TODO - Document this great feature.
@@ -247,44 +172,7 @@ var
     return duration;
   },
 
-  /**
-   * Constructs a new URI by interpreting a path relative to another
-   * URI.
-   * @param basePath {string} a relative or absolute URI
-   * @param path {string} a path part to combine with the base
-   * @return {string} a URI that is equivalent to composing `base`
-   * with `path`
-   * @see http://stackoverflow.com/questions/470832/getting-an-absolute-url-from-a-relative-one-ie6-issue
-   */
-  resolveUrl = videojs.hls.resolveUrl = function(basePath, path) {
-    // use the base element to get the browser to handle URI resolution
-    var
-      oldBase = document.querySelector('base'),
-      docHead = document.querySelector('head'),
-      a = document.createElement('a'),
-      base = oldBase,
-      oldHref,
-      result;
-
-    // prep the document
-    if (oldBase) {
-      oldHref = oldBase.href;
-    } else {
-      base = docHead.appendChild(document.createElement('base'));
-    }
-
-    base.href = basePath;
-    a.href = path;
-    result = a.href;
-
-    // clean up
-    if (oldBase) {
-      oldBase.href = oldHref;
-    } else {
-      docHead.removeChild(base);
-    }
-    return result;
-  },
+  resolveUrl,
 
   /**
    * Initializes the HLS plugin.
@@ -293,7 +181,7 @@ var
   init = function(options) {
     var
       mediaSource = new videojs.MediaSource(),
-      segmentParser = new videojs.hls.SegmentParser(),
+      segmentParser = new videojs.Hls.SegmentParser(),
       player = this,
       srcUrl,
 
@@ -303,7 +191,7 @@ var
       updateDuration;
 
     // if the video element supports HLS natively, do nothing
-    if (videojs.hls.supportsNativeHls) {
+    if (videojs.Hls.supportsNativeHls) {
       return;
     }
 
@@ -346,13 +234,13 @@ var
         }
 
         // do nothing if the source is handled by one of the standard techs
-        for (j in player.options().techOrder) {
-          techName = player.options().techOrder[j];
-          techName = techName[0].toUpperCase() + techName.substring(1);
-          if (videojs[techName].canPlaySource({ type: sources[i].type })) {
-            return;
-          }
-        }
+        //for (j in player.options().techOrder) {
+          //techname = player.options().techorder[j];
+          //techname = techname[0].touppercase() + techname.substring(1);
+          //if (videojs[techname].canplaysource({ type: sources[i].type })) {
+            //return;
+          //}
+        //}
 
         // use the plugin if the MIME type specifies HLS
         if ((/application\/x-mpegURL/).test(sources[i].type) ||
@@ -638,28 +526,158 @@ var
         oldMediaPlaylist = updatedPlaylist;
       });
     });
-    player.src([{
-      src: videojs.URL.createObjectURL(mediaSource),
-      type: "video/flv"
-    }]);
 
-    if (player.options().autoplay) {
-      player.play();
-    }
+    //player.src([{
+      //src: videojs.URL.createObjectURL(mediaSource),
+      //type: "video/flv"
+    //}]);
+
+    //if (player.options().autoplay) {
+      //player.play();
+    //}
   };
 
-videojs.plugin('hls', function() {
-  if (typeof Uint8Array === 'undefined') {
-    return;
+var mpegurlRE = /^application\/(?:x-|vnd\.apple\.)mpegurl/i;
+
+videojs.Hls = videojs.Flash.extend({
+  init: function(player, options, ready) {
+    videojs.Flash.call(this, player, options, ready);
+    player.hls = {};
+    this.ready(function() {
+      console.log('ready!');
+      //init.call(player, options);
+    });
   }
+});
 
-  var initialize = function() {
-    return function() {
-      this.hls = initialize();
-      init.apply(this, arguments);
-    };
+//for (var prop in videojs.Flash) {
+  //videojs.Hls[prop] = videojs.Flash[prop];
+//}
+//for (prop in videojs.Flash.prototype) {
+  //videojs.Hls.prototype[prop] = videojs.Flash[prop];
+//}
+
+videojs.Hls.isSupported = function() {
+  return videojs.Flash.isSupported() && videojs.MediaSource;
+}
+
+videojs.Hls.canPlaySource = function(srcObj) {
+  return mpegurlRE.test(srcObj.type) || videojs.Flash.canPlaySource.call(this, srcObj);
+};
+
+videojs.Hls.supportsNativeHls = (function() {
+  var
+    video = document.createElement('video'),
+    xMpegUrl,
+    vndMpeg;
+
+  // native HLS is definitely not supported if HTML5 video isn't
+  if (!videojs.Html5.isSupported()) {
+    return false;
+  }
+
+  xMpegUrl = video.canPlayType('application/x-mpegURL');
+  vndMpeg = video.canPlayType('application/vnd.apple.mpegURL');
+  return (/probably|maybe/).test(xMpegUrl) ||
+    (/probably|maybe/).test(vndMpeg);
+})();
+
+/**
+ * Creates and sends an XMLHttpRequest.
+ * @param options {string | object} if this argument is a string, it
+ * is intrepreted as a URL and a simple GET request is
+ * inititated. If it is an object, it should contain a `url`
+ * property that indicates the URL to request and optionally a
+ * `method` which is the type of HTTP request to send.
+ * @param callback (optional) {function} a function to call when the
+ * request completes. If the request was not successful, the first
+ * argument will be falsey.
+ * @return {object} the XMLHttpRequest that was initiated.
+ */
+xhr = videojs.Hls.xhr = function(url, callback) {
+  var
+    options = {
+      method: 'GET'
+    },
+    request;
+
+  if (typeof callback !== 'function') {
+    callback = function() {};
+  }
+
+  if (typeof url === 'object') {
+    options = videojs.util.mergeOptions(options, url);
+    url = options.url;
+  }
+
+  request = new window.XMLHttpRequest();
+  request.open(options.method, url);
+
+  if (options.responseType) {
+    request.responseType = options.responseType;
+  }
+  if (options.withCredentials) {
+    request.withCredentials = true;
+  }
+
+  request.onreadystatechange = function() {
+    // wait until the request completes
+    if (this.readyState !== 4) {
+      return;
+    }
+
+    // request error
+    if (this.status >= 400 || this.status === 0) {
+      return callback.call(this, true, url);
+    }
+
+    return callback.call(this, false, url);
   };
-  initialize().apply(this, arguments);
-});
+  request.send(null);
+  return request;
+};
+
+/**
+ * Constructs a new URI by interpreting a path relative to another
+ * URI.
+ * @param basePath {string} a relative or absolute URI
+ * @param path {string} a path part to combine with the base
+ * @return {string} a URI that is equivalent to composing `base`
+ * with `path`
+ * @see http://stackoverflow.com/questions/470832/getting-an-absolute-url-from-a-relative-one-ie6-issue
+ */
+resolveUrl = videojs.Hls.resolveUrl = function(basePath, path) {
+  // use the base element to get the browser to handle URI resolution
+  var
+    oldBase = document.querySelector('base'),
+    docHead = document.querySelector('head'),
+    a = document.createElement('a'),
+    base = oldBase,
+    oldHref,
+    result;
+
+  // prep the document
+  if (oldBase) {
+    oldHref = oldBase.href;
+  } else {
+    base = docHead.appendChild(document.createElement('base'));
+  }
+
+  base.href = basePath;
+  a.href = path;
+  result = a.href;
+
+  // clean up
+  if (oldBase) {
+    oldBase.href = oldHref;
+  } else {
+    docHead.removeChild(base);
+  }
+  return result;
+};
+
+//videojs.Hls.onReady = videojs.Flash.onReady;
+//videojs.Hls.onEvent = videojs.Flash.onEvent;
+//videojs.Hls.onError = videojs.Flash.onError;
 
 })(window, window.videojs, document);

From c6348181104eb9ac52107190b36d2314f877f610 Mon Sep 17 00:00:00 2001
From: Gary Katsevman <git@gkatsev.com>
Date: Wed, 7 May 2014 19:02:40 -0400
Subject: [PATCH 02/14] use mediasource for source

---
 src/videojs-hls.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/videojs-hls.js b/src/videojs-hls.js
index 568fb840f..2617250d4 100644
--- a/src/videojs-hls.js
+++ b/src/videojs-hls.js
@@ -178,7 +178,7 @@ var
    * Initializes the HLS plugin.
    * @param options {mixed} the URL to an HLS playlist
    */
-  init = function(options) {
+  init = function(options, ready) {
     var
       mediaSource = new videojs.MediaSource(),
       segmentParser = new videojs.Hls.SegmentParser(),
@@ -535,18 +535,25 @@ var
     //if (player.options().autoplay) {
       //player.play();
     //}
+
+    var source = options.source;
+    options.source = [{
+      src: videojs.URL.createObjectURL(mediaSource),
+      type: "video/flv"
+    }];
+    //delete options.source;
+    //console.log(options.source);
+    videojs.Flash.call(videojs.Hls, player, options, ready);
+    options.source = source;
+    console.log(options.source);
   };
 
 var mpegurlRE = /^application\/(?:x-|vnd\.apple\.)mpegurl/i;
 
 videojs.Hls = videojs.Flash.extend({
   init: function(player, options, ready) {
-    videojs.Flash.call(this, player, options, ready);
     player.hls = {};
-    this.ready(function() {
-      console.log('ready!');
-      //init.call(player, options);
-    });
+    init.call(player, options, ready);
   }
 });
 

From a5fb7c9f04cd4dd308e5ba26aedffc5bf314fc54 Mon Sep 17 00:00:00 2001
From: Gary Katsevman <git@gkatsev.com>
Date: Wed, 7 May 2014 19:13:42 -0400
Subject: [PATCH 03/14] call Flash with correct context

---
 src/videojs-hls.js | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/src/videojs-hls.js b/src/videojs-hls.js
index 2617250d4..68cc514c1 100644
--- a/src/videojs-hls.js
+++ b/src/videojs-hls.js
@@ -178,9 +178,8 @@ var
    * Initializes the HLS plugin.
    * @param options {mixed} the URL to an HLS playlist
    */
-  init = function(options, ready) {
+  init = function(options, mediaSource) {
     var
-      mediaSource = new videojs.MediaSource(),
       segmentParser = new videojs.Hls.SegmentParser(),
       player = this,
       srcUrl,
@@ -202,7 +201,6 @@ var
         extname,
         i = 0,
         j = 0,
-        src = player.el().querySelector('.vjs-tech').src,
         sources = player.options().sources,
         techName,
         length = sources.length;
@@ -214,17 +212,6 @@ var
         return options.url;
       }
 
-      // src attributes take precedence over source children
-      if (src) {
-
-        // assume files with the m3u8 extension are HLS
-        extname = (/[^#?]*(?:\/[^#?]*\.([^#?]*))/).exec(src);
-        if (extname && extname[1] === 'm3u8') {
-          return src;
-        }
-        return;
-      }
-
       // find the first playable source
       for (; i < length; i++) {
 
@@ -536,24 +523,22 @@ var
       //player.play();
     //}
 
-    var source = options.source;
-    options.source = [{
-      src: videojs.URL.createObjectURL(mediaSource),
-      type: "video/flv"
-    }];
-    //delete options.source;
-    //console.log(options.source);
-    videojs.Flash.call(videojs.Hls, player, options, ready);
-    options.source = source;
-    console.log(options.source);
   };
 
 var mpegurlRE = /^application\/(?:x-|vnd\.apple\.)mpegurl/i;
 
 videojs.Hls = videojs.Flash.extend({
   init: function(player, options, ready) {
+    var mediaSource = new videojs.MediaSource();
+    var source = options.source;
+    options.source = {
+      src: videojs.URL.createObjectURL(mediaSource),
+      type: "video/flv"
+    };
+    videojs.Flash.call(this, player, options, ready);
     player.hls = {};
-    init.call(player, options, ready);
+    options.source = source;
+    init.call(player, options, mediaSource);
   }
 });
 

From a548f800defcf4815b4164fdd7006f666c808061 Mon Sep 17 00:00:00 2001
From: Gary Katsevman <git@gkatsev.com>
Date: Fri, 9 May 2014 16:12:57 -0400
Subject: [PATCH 04/14] copy flash swf option

---
 src/videojs-hls.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/videojs-hls.js b/src/videojs-hls.js
index 68cc514c1..8b393feb0 100644
--- a/src/videojs-hls.js
+++ b/src/videojs-hls.js
@@ -531,6 +531,8 @@ videojs.Hls = videojs.Flash.extend({
   init: function(player, options, ready) {
     var mediaSource = new videojs.MediaSource();
     var source = options.source;
+    var settings = player.options();
+    options.swf = settings.flash.swf;
     options.source = {
       src: videojs.URL.createObjectURL(mediaSource),
       type: "video/flv"

From 5727b14ed595faadd41486fbdcf83d4e519d2153 Mon Sep 17 00:00:00 2001
From: Gary Katsevman <git@gkatsev.com>
Date: Mon, 19 May 2014 13:47:07 -0400
Subject: [PATCH 05/14] PlaylistLoader is on videojs.Hls

---
 src/videojs-hls.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/videojs-hls.js b/src/videojs-hls.js
index 8b393feb0..b583699d9 100644
--- a/src/videojs-hls.js
+++ b/src/videojs-hls.js
@@ -484,7 +484,7 @@ var
 
       player.hls.mediaIndex = 0;
       player.hls.playlists =
-        new videojs.hls.PlaylistLoader(srcUrl, settings.withCredentials);
+        new videojs.Hls.PlaylistLoader(srcUrl, settings.withCredentials);
       player.hls.playlists.on('loadedmetadata', function() {
         oldMediaPlaylist = player.hls.playlists.media();
 

From d2a7225b3dd82a9b01eed53965b7812c8568cf53 Mon Sep 17 00:00:00 2001
From: Gary Katsevman <git@gkatsev.com>
Date: Mon, 19 May 2014 17:37:20 -0400
Subject: [PATCH 06/14] Init media sources in src method. Moved initializations
 to init. Rename and repurpose original init method to initSource which gets
 called from #src.

---
 src/videojs-hls.js | 117 +++++++++++----------------------------------
 1 file changed, 29 insertions(+), 88 deletions(-)

diff --git a/src/videojs-hls.js b/src/videojs-hls.js
index b583699d9..3721f6d25 100644
--- a/src/videojs-hls.js
+++ b/src/videojs-hls.js
@@ -174,82 +174,15 @@ var
 
   resolveUrl,
 
-  /**
-   * Initializes the HLS plugin.
-   * @param options {mixed} the URL to an HLS playlist
-   */
-  init = function(options, mediaSource) {
+  initSource = function(player, mediaSource, srcUrl) {
     var
       segmentParser = new videojs.Hls.SegmentParser(),
-      player = this,
-      srcUrl,
 
       segmentXhr,
-      settings,
+      settings = videojs.util.mergeOptions({}, player.options().hls),
       fillBuffer,
       updateDuration;
 
-    // if the video element supports HLS natively, do nothing
-    if (videojs.Hls.supportsNativeHls) {
-      return;
-    }
-
-    settings = videojs.util.mergeOptions({}, options);
-
-    srcUrl = (function() {
-      var
-        extname,
-        i = 0,
-        j = 0,
-        sources = player.options().sources,
-        techName,
-        length = sources.length;
-
-      // use the URL specified in options if one was provided
-      if (typeof options === 'string') {
-        return options;
-      } else if (options && options.url) {
-        return options.url;
-      }
-
-      // find the first playable source
-      for (; i < length; i++) {
-
-        // ignore sources without a specified type
-        if (!sources[i].type) {
-          continue;
-        }
-
-        // do nothing if the source is handled by one of the standard techs
-        //for (j in player.options().techOrder) {
-          //techname = player.options().techorder[j];
-          //techname = techname[0].touppercase() + techname.substring(1);
-          //if (videojs[techname].canplaysource({ type: sources[i].type })) {
-            //return;
-          //}
-        //}
-
-        // use the plugin if the MIME type specifies HLS
-        if ((/application\/x-mpegURL/).test(sources[i].type) ||
-            (/application\/vnd\.apple\.mpegURL/).test(sources[i].type)) {
-          return sources[i].src;
-        }
-      }
-    })();
-
-    if (!srcUrl) {
-      // do nothing until the plugin is initialized with a valid URL
-      videojs.log('hls: no valid playlist URL specified');
-      return;
-    }
-
-    // expose the HLS plugin state
-    player.hls.readyState = function() {
-      if (!player.hls.media) {
-        return 0; // HAVE_NOTHING
-      }
-      return 1;   // HAVE_METADATA
-    };
 
     player.on('seeking', function() {
       var currentTime = player.currentTime();
@@ -513,37 +446,45 @@ var
         oldMediaPlaylist = updatedPlaylist;
       });
     });
-
-    //player.src([{
-      //src: videojs.URL.createObjectURL(mediaSource),
-      //type: "video/flv"
-    //}]);
-
-    //if (player.options().autoplay) {
-      //player.play();
-    //}
-
   };
 
 var mpegurlRE = /^application\/(?:x-|vnd\.apple\.)mpegurl/i;
 
 videojs.Hls = videojs.Flash.extend({
   init: function(player, options, ready) {
-    var mediaSource = new videojs.MediaSource();
-    var source = options.source;
-    var settings = player.options();
+    var
+      source = options.source,
+      settings = player.options();
+
+    delete options.source;
     options.swf = settings.flash.swf;
-    options.source = {
-      src: videojs.URL.createObjectURL(mediaSource),
-      type: "video/flv"
-    };
     videojs.Flash.call(this, player, options, ready);
     player.hls = {};
     options.source = source;
-    init.call(player, options, mediaSource);
+    videojs.Hls.prototype.src.call(player, options.source && options.source.src);
   }
 });
 
+videojs.Hls.prototype.src = function(src) {
+  var
+    player = this.player(),
+    mediaSource,
+    source;
+
+  if (src) {
+    mediaSource = new videojs.MediaSource(),
+    source = {
+      src: videojs.URL.createObjectURL(mediaSource),
+      type: "video/flv"
+    };
+    player.hls.mediaSource = mediaSource;
+    initSource(player, mediaSource, src);
+    this.ready(function() {
+      this.el().querySelector('.vjs-tech').vjs_src(source.src);
+    });
+  }
+}
+
 //for (var prop in videojs.Flash) {
   //videojs.Hls[prop] = videojs.Flash[prop];
 //}
@@ -553,7 +494,7 @@ videojs.Hls = videojs.Flash.extend({
 
 videojs.Hls.isSupported = function() {
   return videojs.Flash.isSupported() && videojs.MediaSource;
-}
+};
 
 videojs.Hls.canPlaySource = function(srcObj) {
   return mpegurlRE.test(srcObj.type) || videojs.Flash.canPlaySource.call(this, srcObj);

From 73420aa6041dd6c050c783719a3cca61ba5415a6 Mon Sep 17 00:00:00 2001
From: Gary Katsevman <git@gkatsev.com>
Date: Mon, 19 May 2014 17:39:56 -0400
Subject: [PATCH 07/14] Rename videojs.hls to videojs.Hls to use the tech

---
 test/exp-golomb_test.js      |  2 +-
 test/flv-tag_test.js         |  2 +-
 test/h264-stream_test.js     |  8 +++----
 test/muxer/index.html        |  6 +++---
 test/playlist-loader_test.js | 42 ++++++++++++++++++------------------
 test/segment-parser.js       |  8 +++----
 test/videojs-hls.html        |  2 +-
 7 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/test/exp-golomb_test.js b/test/exp-golomb_test.js
index f78e6e0d8..062344586 100644
--- a/test/exp-golomb_test.js
+++ b/test/exp-golomb_test.js
@@ -21,7 +21,7 @@
   */
 var
   buffer,
-  ExpGolomb = window.videojs.hls.ExpGolomb,
+  ExpGolomb = window.videojs.Hls.ExpGolomb,
   expGolomb;
 
 module('Exponential Golomb coding');
diff --git a/test/flv-tag_test.js b/test/flv-tag_test.js
index e2590264c..11f8fc4ec 100644
--- a/test/flv-tag_test.js
+++ b/test/flv-tag_test.js
@@ -19,7 +19,7 @@
       notStrictEqual(actual, expected, [message])
       throws(block, [expected], [message])
   */
-var FlvTag = window.videojs.hls.FlvTag;
+var FlvTag = window.videojs.Hls.FlvTag;
 
 module('FLV tag');
 
diff --git a/test/h264-stream_test.js b/test/h264-stream_test.js
index 20580048d..57ed7c467 100644
--- a/test/h264-stream_test.js
+++ b/test/h264-stream_test.js
@@ -2,12 +2,12 @@
 module('H264 Stream');
 
 var
-  nalUnitTypes = window.videojs.hls.NALUnitType,
-  FlvTag = window.videojs.hls.FlvTag;
+  nalUnitTypes = window.videojs.Hls.NALUnitType,
+  FlvTag = window.videojs.Hls.FlvTag;
 
 test('metadata is generated for IDRs after a full NAL unit is written', function() {
   var
-    h264Stream = new videojs.hls.H264Stream(),
+    h264Stream = new videojs.Hls.H264Stream(),
     accessUnitDelimiter = new Uint8Array([
       0x00,
       0x00,
@@ -62,7 +62,7 @@ test('metadata is generated for IDRs after a full NAL unit is written', function
 
 test('starting PTS values can be negative', function() {
   var
-    h264Stream = new videojs.hls.H264Stream(),
+    h264Stream = new videojs.Hls.H264Stream(),
     accessUnitDelimiter = new Uint8Array([
       0x00,
       0x00,
diff --git a/test/muxer/index.html b/test/muxer/index.html
index a32fffb87..042a1a01d 100644
--- a/test/muxer/index.html
+++ b/test/muxer/index.html
@@ -127,7 +127,7 @@ <h3>footer</h3>
     original.addEventListener('change', function() {
       var reader = new FileReader();
       reader.addEventListener('loadend', function() {
-        var parser = new videojs.hls.SegmentParser(),
+        var parser = new videojs.Hls.SegmentParser(),
             tags = [parser.getFlvHeader()],
             tag,
             hex,
@@ -164,7 +164,7 @@ <h3>footer</h3>
         }
 
         hex = '<pre>'
-        hex += videojs.hls.utils.hexDump(data);
+        hex += videojs.Hls.utils.hexDump(data);
         hex += '</pre>'
     
         vjsOutput.innerHTML = hex;
@@ -201,7 +201,7 @@ <h3>footer</h3>
         }
 
         // output the hex dump
-        hex += videojs.hls.utils.hexDump(bytes);
+        hex += videojs.Hls.utils.hexDump(bytes);
         hex += '</pre>';
         workingOutput.innerHTML = hex;
       });
diff --git a/test/playlist-loader_test.js b/test/playlist-loader_test.js
index 23cedf1ce..21a02fe4a 100644
--- a/test/playlist-loader_test.js
+++ b/test/playlist-loader_test.js
@@ -36,26 +36,26 @@
 
   test('throws if the playlist url is empty or undefined', function() {
     throws(function() {
-      videojs.hls.PlaylistLoader();
+      videojs.Hls.PlaylistLoader();
     }, 'requires an argument');
     throws(function() {
-      videojs.hls.PlaylistLoader('');
+      videojs.Hls.PlaylistLoader('');
     }, 'does not accept the empty string');
   });
 
   test('starts without any metadata', function() {
-    var loader = new videojs.hls.PlaylistLoader('master.m3u8');
+    var loader = new videojs.Hls.PlaylistLoader('master.m3u8');
     strictEqual(loader.state, 'HAVE_NOTHING', 'no metadata has loaded yet');
   });
 
   test('requests the initial playlist immediately', function() {
-    new videojs.hls.PlaylistLoader('master.m3u8');
+    new videojs.Hls.PlaylistLoader('master.m3u8');
     strictEqual(requests.length, 1, 'made a request');
     strictEqual(requests[0].url, 'master.m3u8', 'requested the initial playlist');
   });
 
   test('moves to HAVE_MASTER after loading a master playlist', function() {
-    var loader = new videojs.hls.PlaylistLoader('master.m3u8');
+    var loader = new videojs.Hls.PlaylistLoader('master.m3u8');
     requests.pop().respond(200, null,
                            '#EXTM3U\n' +
                            '#EXT-X-STREAM-INF:\n' +
@@ -67,7 +67,7 @@
   test('jumps to HAVE_METADATA when initialized with a media playlist', function() {
     var
       loadedmetadatas = 0,
-      loader = new videojs.hls.PlaylistLoader('media.m3u8');
+      loader = new videojs.Hls.PlaylistLoader('media.m3u8');
     loader.on('loadedmetadata', function() {
       loadedmetadatas++;
     });
@@ -85,7 +85,7 @@
   });
 
   test('jumps to HAVE_METADATA when initialized with a live media playlist', function() {
-    var loader = new videojs.hls.PlaylistLoader('media.m3u8');
+    var loader = new videojs.Hls.PlaylistLoader('media.m3u8');
     requests.pop().respond(200, null,
                            '#EXTM3U\n' +
                            '#EXTINF:10,\n' +
@@ -99,7 +99,7 @@
     var
       loadedPlaylist = 0,
       loadedMetadata = 0,
-      loader = new videojs.hls.PlaylistLoader('master.m3u8');
+      loader = new videojs.Hls.PlaylistLoader('master.m3u8');
     loader.on('loadedplaylist', function() {
       loadedPlaylist++;
     });
@@ -131,7 +131,7 @@
   });
 
   test('moves to HAVE_CURRENT_METADATA when refreshing the playlist', function() {
-    var loader = new videojs.hls.PlaylistLoader('live.m3u8');
+    var loader = new videojs.Hls.PlaylistLoader('live.m3u8');
     requests.pop().respond(200, null,
                            '#EXTM3U\n' +
                            '#EXTINF:10,\n' +
@@ -145,7 +145,7 @@
   });
 
   test('returns to HAVE_METADATA after refreshing the playlist', function() {
-    var loader = new videojs.hls.PlaylistLoader('live.m3u8');
+    var loader = new videojs.Hls.PlaylistLoader('live.m3u8');
     requests.pop().respond(200, null,
                            '#EXTM3U\n' +
                            '#EXTINF:10,\n' +
@@ -161,7 +161,7 @@
   test('emits an error when an initial playlist request fails', function() {
     var
       errors = [],
-      loader = new videojs.hls.PlaylistLoader('master.m3u8');
+      loader = new videojs.Hls.PlaylistLoader('master.m3u8');
 
     loader.on('error', function() {
       errors.push(loader.error);
@@ -175,7 +175,7 @@
   test('errors when an initial media playlist request fails', function() {
     var
       errors = [],
-      loader = new videojs.hls.PlaylistLoader('master.m3u8');
+      loader = new videojs.Hls.PlaylistLoader('master.m3u8');
 
     loader.on('error', function() {
       errors.push(loader.error);
@@ -197,7 +197,7 @@
   // http://tools.ietf.org/html/draft-pantos-http-live-streaming-12#section-6.3.4
   test('halves the refresh timeout if a playlist is unchanged' +
        'since the last reload', function() {
-    new videojs.hls.PlaylistLoader('live.m3u8');
+    new videojs.Hls.PlaylistLoader('live.m3u8');
     requests.pop().respond(200, null,
                            '#EXTM3U\n' +
                            '#EXT-X-MEDIA-SEQUENCE:0\n' +
@@ -218,7 +218,7 @@
   });
 
   test('media-sequence updates are considered a playlist change', function() {
-    new videojs.hls.PlaylistLoader('live.m3u8');
+    new videojs.Hls.PlaylistLoader('live.m3u8');
     requests.pop().respond(200, null,
                            '#EXTM3U\n' +
                            '#EXT-X-MEDIA-SEQUENCE:0\n' +
@@ -238,7 +238,7 @@
   test('emits an error if a media refresh fails', function() {
     var
       errors = 0,
-      loader = new videojs.hls.PlaylistLoader('live.m3u8');
+      loader = new videojs.Hls.PlaylistLoader('live.m3u8');
 
     loader.on('error', function() {
       errors++;
@@ -256,7 +256,7 @@
   });
 
   test('switches media playlists when requested', function() {
-    var loader = new videojs.hls.PlaylistLoader('master.m3u8');
+    var loader = new videojs.Hls.PlaylistLoader('master.m3u8');
     requests.pop().respond(200, null,
                            '#EXTM3U\n' +
                            '#EXT-X-STREAM-INF:BANDWIDTH=1\n' +
@@ -284,7 +284,7 @@
   });
 
   test('can switch media playlists based on URI', function() {
-    var loader = new videojs.hls.PlaylistLoader('master.m3u8');
+    var loader = new videojs.Hls.PlaylistLoader('master.m3u8');
     requests.pop().respond(200, null,
                            '#EXTM3U\n' +
                            '#EXT-X-STREAM-INF:BANDWIDTH=1\n' +
@@ -312,7 +312,7 @@
   });
 
   test('aborts in-flight playlist refreshes when switching', function() {
-    var loader = new videojs.hls.PlaylistLoader('master.m3u8');
+    var loader = new videojs.Hls.PlaylistLoader('master.m3u8');
     requests.pop().respond(200, null,
                            '#EXTM3U\n' +
                            '#EXT-X-STREAM-INF:BANDWIDTH=1\n' +
@@ -331,7 +331,7 @@
   });
 
   test('switching to the active playlist is a no-op', function() {
-    var loader = new videojs.hls.PlaylistLoader('master.m3u8');
+    var loader = new videojs.Hls.PlaylistLoader('master.m3u8');
     requests.pop().respond(200, null,
                            '#EXTM3U\n' +
                            '#EXT-X-STREAM-INF:BANDWIDTH=1\n' +
@@ -350,7 +350,7 @@
   });
 
   test('throws an error if a media switch is initiated too early', function() {
-    var loader = new videojs.hls.PlaylistLoader('master.m3u8');
+    var loader = new videojs.Hls.PlaylistLoader('master.m3u8');
 
     throws(function() {
       loader.media('high.m3u8');
@@ -368,7 +368,7 @@
   });
 
   test('throws an error if a switch to an unrecognized playlist is requested', function() {
-    var loader = new videojs.hls.PlaylistLoader('master.m3u8');
+    var loader = new videojs.Hls.PlaylistLoader('master.m3u8');
     requests.pop().respond(200, null,
                            '#EXTM3U\n' +
                            '#EXT-X-STREAM-INF:BANDWIDTH=1\n' +
diff --git a/test/segment-parser.js b/test/segment-parser.js
index 4c9e9e984..c8b7f9634 100644
--- a/test/segment-parser.js
+++ b/test/segment-parser.js
@@ -39,7 +39,7 @@
 
   module('segment parser', {
     setup: function() {
-      parser = new window.videojs.hls.SegmentParser();
+      parser = new window.videojs.Hls.SegmentParser();
     }
   });
 
@@ -168,11 +168,11 @@
         result = result.concat(makePsi(settings));
 
         // ensure the resulting packet is the correct size
-        result.length = window.videojs.hls.SegmentParser.MP2T_PACKET_LENGTH;
+        result.length = window.videojs.Hls.SegmentParser.MP2T_PACKET_LENGTH;
         return result;
       },
-      h264Type = window.videojs.hls.SegmentParser.STREAM_TYPES.h264,
-      adtsType = window.videojs.hls.SegmentParser.STREAM_TYPES.adts;
+      h264Type = window.videojs.Hls.SegmentParser.STREAM_TYPES.h264,
+      adtsType = window.videojs.Hls.SegmentParser.STREAM_TYPES.adts;
 
     parser.parseSegmentBinaryData(new Uint8Array(makePacket({
       programs: {
diff --git a/test/videojs-hls.html b/test/videojs-hls.html
index 88003fe5b..0791299e8 100644
--- a/test/videojs-hls.html
+++ b/test/videojs-hls.html
@@ -15,7 +15,7 @@
   <script src="../libs/qunit/qunit.js"></script>
 
   <!-- video.js -->
-  <script src="../node_modules/video.js/dist/video-js/video.js"></script>
+  <script src="../node_modules/video.js/dist/video-js/video.dev.js"></script>
   <script src="../node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js"></script>
 
   <!-- HLS plugin -->

From a81238c7186b6887ca6ae96292383a5dadd89ad1 Mon Sep 17 00:00:00 2001
From: Gary Katsevman <git@gkatsev.com>
Date: Tue, 20 May 2014 19:33:48 -0400
Subject: [PATCH 08/14] Update HLS: dispose tech, playlist loader don't trigger
 loadedmetadata if there was an error no need for duration update workarounds,
 add duration to tech update all the tests remove irrelevant tests

---
 src/playlist-loader.js   |  14 +-
 src/videojs-hls.js       |  44 ++++--
 test/videojs-hls.html    |   2 +-
 test/videojs-hls_test.js | 303 ++++++++++++++++++---------------------
 4 files changed, 178 insertions(+), 185 deletions(-)

diff --git a/src/playlist-loader.js b/src/playlist-loader.js
index 87ea415cd..8125684eb 100644
--- a/src/playlist-loader.js
+++ b/src/playlist-loader.js
@@ -51,6 +51,7 @@
       var
         loader = this,
         media,
+        mediaUpdateTimeout,
         request,
 
         haveMetadata = function(error, xhr, url) {
@@ -88,7 +89,7 @@
 
           // refresh live playlists after a target duration passes
           if (!loader.media().endList) {
-            window.setTimeout(function() {
+            mediaUpdateTimeout = window.setTimeout(function() {
               loader.trigger('mediaupdatetimeout');
             }, refreshDelay);
           }
@@ -104,6 +105,13 @@
 
       loader.state = 'HAVE_NOTHING';
 
+      loader.dispose = function() {
+        if (request) {
+          request.abort();
+        }
+        window.clearTimeout(mediaUpdateTimeout);
+      };
+
       /**
        * When called without any arguments, returns the currently
        * active media playlist. When called with a single argument,
@@ -213,7 +221,9 @@
             haveMetadata(error,
                          this,
                          parser.manifest.playlists[0].uri);
-            loader.trigger('loadedmetadata');
+            if (!error) {
+              loader.trigger('loadedmetadata');
+            }
           });
           return loader.trigger('loadedplaylist');
         }
diff --git a/src/videojs-hls.js b/src/videojs-hls.js
index 3721f6d25..a611d5b87 100644
--- a/src/videojs-hls.js
+++ b/src/videojs-hls.js
@@ -153,7 +153,13 @@ var
     var
       duration = 0,
       segment,
-      i = (playlist.segments || []).length;
+      i;
+
+    if (!playlist) {
+      return 0;
+    }
+
+    i = (playlist.segments || []).length;
 
     // if present, use the duration specified in the playlist
     if (playlist.totalDuration) {
@@ -205,16 +211,8 @@ var
      * Update the player duration
      */
     updateDuration = function(playlist) {
-      var tech;
       // update the duration
       player.duration(totalDuration(playlist));
-      // tell the flash tech of the new duration
-      tech = player.el().querySelector('.vjs-tech');
-      if(tech.vjs_setProperty) {
-        tech.vjs_setProperty('duration', player.duration());
-      }
-      // manually fire the duration change
-      player.trigger('durationchange');
     };
 
     /**
@@ -310,7 +308,8 @@ var
       }
 
       // if no segments are available, do nothing
-      if (!player.hls.playlists.media().segments) {
+      if (player.hls.playlists.state === "HAVE_NOTHING" ||
+          !player.hls.playlists.media().segments) {
         return;
       }
 
@@ -456,12 +455,12 @@ videojs.Hls = videojs.Flash.extend({
       source = options.source,
       settings = player.options();
 
+    player.hls = this;
     delete options.source;
     options.swf = settings.flash.swf;
     videojs.Flash.call(this, player, options, ready);
-    player.hls = {};
     options.source = source;
-    videojs.Hls.prototype.src.call(player, options.source && options.source.src);
+    videojs.Hls.prototype.src.call(this, options.source && options.source.src);
   }
 });
 
@@ -472,7 +471,7 @@ videojs.Hls.prototype.src = function(src) {
     source;
 
   if (src) {
-    mediaSource = new videojs.MediaSource(),
+    mediaSource = new videojs.MediaSource();
     source = {
       src: videojs.URL.createObjectURL(mediaSource),
       type: "video/flv"
@@ -480,10 +479,25 @@ videojs.Hls.prototype.src = function(src) {
     player.hls.mediaSource = mediaSource;
     initSource(player, mediaSource, src);
     this.ready(function() {
-      this.el().querySelector('.vjs-tech').vjs_src(source.src);
+      this.el().vjs_src(source.src);
     });
   }
-}
+};
+
+videojs.Hls.prototype.duration = function() {
+  var playlists = this.player().hls.playlists;
+  if (playlists) {
+    return totalDuration(playlists.media());
+  }
+  return 0;
+};
+
+videojs.Hls.prototype.dispose = function() {
+  if (this.player().hls.playlists) {
+    this.player().hls.playlists.dispose();
+  }
+  videojs.Flash.prototype.dispose.call(this);
+};
 
 //for (var prop in videojs.Flash) {
   //videojs.Hls[prop] = videojs.Flash[prop];
diff --git a/test/videojs-hls.html b/test/videojs-hls.html
index 0791299e8..88003fe5b 100644
--- a/test/videojs-hls.html
+++ b/test/videojs-hls.html
@@ -15,7 +15,7 @@
   <script src="../libs/qunit/qunit.js"></script>
 
   <!-- video.js -->
-  <script src="../node_modules/video.js/dist/video-js/video.dev.js"></script>
+  <script src="../node_modules/video.js/dist/video-js/video.js"></script>
   <script src="../node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js"></script>
 
   <!-- HLS plugin -->
diff --git a/test/videojs-hls_test.js b/test/videojs-hls_test.js
index 1f92969bb..958e58970 100644
--- a/test/videojs-hls_test.js
+++ b/test/videojs-hls_test.js
@@ -22,12 +22,11 @@
 
 var
   player,
-  oldFlashSupported,
+  oldMediaSourceOpen,
   oldSegmentParser,
   oldSetTimeout,
   oldSourceBuffer,
-  oldSupportsNativeHls,
-  xhrUrls,
+  oldFlashSupported,
   requests,
   xhr,
 
@@ -82,37 +81,37 @@ var
 
 module('HLS', {
   setup: function() {
+    oldMediaSourceOpen = videojs.MediaSource.open;
+    videojs.MediaSource.open = function() {};
 
     // mock out Flash features for phantomjs
     oldFlashSupported = videojs.Flash.isSupported;
     videojs.Flash.isSupported = function() {
       return true;
     };
+
     oldSourceBuffer = window.videojs.SourceBuffer;
     window.videojs.SourceBuffer = function() {
       this.appendBuffer = function() {};
       this.abort = function() {};
     };
 
-    // force native HLS to be ignored
-    oldSupportsNativeHls = videojs.hls.supportsNativeHls;
-    videojs.hls.supportsNativeHls = false;
-
     // create the test player
     var video = document.createElement('video');
     document.querySelector('#qunit-fixture').appendChild(video);
     player = videojs(video, {
       flash: {
-        swf: '../node_modules/video.js/dist/video-js/video-js.swf'
+        swf: ''//'../node_modules/video.js/dist/video-js/video-js.swf'
       },
-      techOrder: ['flash']
+      techOrder: ['hls']
     });
+
     player.buffered = function() {
       return videojs.createTimeRange(0, 0);
     };
 
     // store functionality that some tests need to mock
-    oldSegmentParser = videojs.hls.SegmentParser;
+    oldSegmentParser = videojs.Hls.SegmentParser;
     oldSetTimeout = window.setTimeout;
 
     // fake XHRs
@@ -121,13 +120,18 @@ module('HLS', {
     xhr.onCreate = function(xhr) {
       requests.push(xhr);
     };
-    xhrUrls = [];
+
+    var tech = player.el().querySelector('.vjs-tech');
+    tech.vjs_getProperty = function() {};
+    tech.vjs_src = function() {};
+    videojs.Flash.onReady(tech.id);
   },
 
   teardown: function() {
+    player.dispose();
     videojs.Flash.isSupported = oldFlashSupported;
-    videojs.hls.supportsNativeHls = oldSupportsNativeHls;
-    videojs.hls.SegmentParser = oldSegmentParser;
+    videojs.MediaSource.open = oldMediaSourceOpen;
+    videojs.Hls.SegmentParser = oldSegmentParser;
     videojs.SourceBuffer = oldSourceBuffer;
     window.setTimeout = oldSetTimeout;
     xhr.restore();
@@ -140,8 +144,8 @@ test('starts playing if autoplay is specified', function() {
     plays++;
   };
   player.options().autoplay = true;
-  player.hls('manifest/playlist.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/playlist.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -155,9 +159,9 @@ test('creates a PlaylistLoader on init', function() {
     loadedmetadata = true;
   });
 
-  player.hls('manifest/playlist.m3u8');
-  ok(!player.hls.playlists, 'waits for sourceopen to create the loader');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  ok(!player.hls.playlists, 'waits for set src to create the loader');
+  player.src({src:'manifest/playlist.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
   standardXHRResponse(requests[0]);
@@ -178,8 +182,8 @@ test('sets the duration if one is available on the playlist', function() {
     }
     calls++;
   };
-  player.hls('manifest/media.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -197,8 +201,8 @@ test('calculates the duration if needed', function() {
     }
     durations.push(duration);
   };
-  player.hls('http://example.com/manifest/missingExtinf.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'http://example.com/manifest/missingExtinf.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -210,11 +214,11 @@ test('calculates the duration if needed', function() {
 });
 
 test('starts downloading a segment on loadedmetadata', function() {
-  player.hls('manifest/media.m3u8');
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
   player.buffered = function() {
     return videojs.createTimeRange(0, 0);
   };
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -228,8 +232,8 @@ test('starts downloading a segment on loadedmetadata', function() {
 });
 
 test('recognizes absolute URIs and requests them unmodified', function() {
-  player.hls('manifest/absoluteUris.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/absoluteUris.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -241,8 +245,8 @@ test('recognizes absolute URIs and requests them unmodified', function() {
 });
 
 test('recognizes domain-relative URLs', function() {
-  player.hls('manifest/domainUris.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/domainUris.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -253,14 +257,25 @@ test('recognizes domain-relative URLs', function() {
               'the first segment is requested');
 });
 
-test('re-initializes the plugin for each source', function() {
-  var firstInit, secondInit;
-  player.hls('manifest/master.m3u8');
-  firstInit = player.hls;
-  player.hls('manifest/master.m3u8');
-  secondInit = player.hls;
+test('re-initializes the tech for each source', function() {
+  var firstPlaylists, secondPlaylists, firstMSE, secondMSE;
+
+  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
+    type: 'sourceopen'
+  });
+  firstPlaylists = player.hls.playlists;
+  firstMSE = player.hls.mediaSource;
+
+  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
+    type: 'sourceopen'
+  });
+  secondPlaylists = player.hls.playlists;
+  secondMSE = player.hls.mediaSource;
 
-  notStrictEqual(firstInit, secondInit, 'the plugin object is replaced');
+  notStrictEqual(firstPlaylists, secondPlaylists, 'the playlist object is not reused');
+  notStrictEqual(firstMSE, secondMSE, 'the media source object is not reused');
 });
 
 test('triggers an error when a master playlist request errors', function() {
@@ -268,8 +283,8 @@ test('triggers an error when a master playlist request errors', function() {
   player.on('error', function() {
     error = player.hls.error;
   });
-  player.hls('manifest/master.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
   requests.pop().respond(500);
@@ -279,8 +294,8 @@ test('triggers an error when a master playlist request errors', function() {
 });
 
 test('downloads media playlists after loading the master', function() {
-  player.hls('manifest/master.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -309,8 +324,8 @@ test('timeupdates do not check to fill the buffer until a media playlist is read
     };
     this.send = function() {};
   };
-  player.hls('manifest/media.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
   player.trigger('timeupdate');
@@ -320,8 +335,8 @@ test('timeupdates do not check to fill the buffer until a media playlist is read
 });
 
 test('calculates the bandwidth after downloading a segment', function() {
-  player.hls('manifest/media.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -337,12 +352,12 @@ test('calculates the bandwidth after downloading a segment', function() {
 
 test('selects a playlist after segment downloads', function() {
   var calls = 0;
-  player.hls('manifest/master.m3u8');
+  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
   player.hls.selectPlaylist = function() {
     calls++;
     return player.hls.playlists.master.playlists[0];
   };
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -367,8 +382,8 @@ test('selects a playlist after segment downloads', function() {
 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({
+  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -386,7 +401,7 @@ test('updates the duration after switching playlists', function() {
   var
     calls = 0,
     selectedPlaylist = false;
-  player.hls('manifest/master.m3u8');
+  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
   player.hls.selectPlaylist = function() {
     selectedPlaylist = true;
     return player.hls.playlists.master.playlists[1];
@@ -400,7 +415,7 @@ test('updates the duration after switching playlists', function() {
       calls++;
     }
   };
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -418,8 +433,8 @@ test('downloads additional playlists if required', function() {
     playlist = {
       uri: 'media3.m3u8'
     };
-  player.hls('manifest/master.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -456,8 +471,8 @@ test('downloads additional playlists if required', function() {
 
 test('selects a playlist below the current bandwidth', function() {
   var playlist;
-  player.hls('manifest/master.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -478,8 +493,8 @@ test('selects a playlist below the current bandwidth', function() {
 
 test('raises the minimum bitrate for a stream proportionially', function() {
   var playlist;
-  player.hls('manifest/master.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -500,8 +515,8 @@ test('raises the minimum bitrate for a stream proportionially', function() {
 
 test('uses the lowest bitrate if no other is suitable', function() {
   var playlist;
-  player.hls('manifest/master.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -520,9 +535,9 @@ test('uses the lowest bitrate if no other is suitable', function() {
 test('selects the correct rendition by player dimensions', function() {
   var playlist;
 
-  player.hls('manifest/master.m3u8');
+  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
 
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -550,14 +565,14 @@ test('selects the correct rendition by player dimensions', function() {
 
 
 test('does not download the next segment if the buffer is full', function() {
-  player.hls('manifest/media.m3u8');
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
   player.currentTime = function() {
     return 15;
   };
   player.buffered = function() {
     return videojs.createTimeRange(0, 20);
   };
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -569,8 +584,8 @@ test('does not download the next segment if the buffer is full', function() {
 });
 
 test('downloads the next segment if the buffer is getting low', function() {
-  player.hls('manifest/media.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -597,8 +612,8 @@ test('downloads the next segment if the buffer is getting low', function() {
 });
 
 test('stops downloading segments at the end of the playlist', function() {
-  player.hls('manifest/media.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
   standardXHRResponse(requests[0]);
@@ -606,13 +621,13 @@ test('stops downloading segments at the end of the playlist', function() {
   player.hls.mediaIndex = 4;
   player.trigger('timeupdate');
 
-  strictEqual(xhrUrls.length, 0, 'no request is made');
+  strictEqual(requests.length, 0, 'no request is made');
 });
 
 test('only makes one segment request at a time', function() {
   var openedXhrs = 0;
-  player.hls('manifest/media.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
   xhr.restore();
@@ -634,68 +649,9 @@ test('only makes one segment request at a time', function() {
   xhr = sinon.useFakeXMLHttpRequest();
 });
 
-test('uses the src attribute if no options are provided and it ends in ".m3u8"', function() {
-  var url = 'http://example.com/services/mobile/streaming/index/master.m3u8?videoId=1824650741001';
-  player.el().querySelector('.vjs-tech').src = url;
-  player.hls();
-  videojs.mediaSources[player.currentSrc()].trigger({
-    type: 'sourceopen'
-  });
-
-  strictEqual(requests[0].url, url, 'currentSrc is used');
-});
-
-test('ignores src attribute if it doesn\'t have the "m3u8" extension', function() {
-  var tech = player.el().querySelector('.vjs-tech');
-  tech.src = 'basdfasdfasdfliel//.m3u9';
-  player.hls();
-  ok(!(player.currentSrc() in videojs.mediaSources), 'no media source is created');
-  strictEqual(requests.length, 0, 'no request is made');
-
-  tech.src = '';
-  player.hls();
-  ok(!(player.currentSrc() in videojs.mediaSources), 'no media source is created');
-  strictEqual(requests.length, 0, 'no request is made');
-
-  tech.src = 'http://example.com/movie.mp4?q=why.m3u8';
-  player.hls();
-  ok(!(player.currentSrc() in videojs.mediaSources), 'no media source is created');
-  strictEqual(requests.length, 0, 'no request is made');
-
-  tech.src = 'http://example.m3u8/movie.mp4';
-  player.hls();
-  ok(!(player.currentSrc() in videojs.mediaSources), 'no media source is created');
-  strictEqual(requests.length, 0, 'no request is made');
-
-  tech.src = '//example.com/movie.mp4#http://tricky.com/master.m3u8';
-  player.hls();
-  ok(!(player.currentSrc() in videojs.mediaSources), 'no media source is created');
-  strictEqual(requests.length, 0, 'no request is made');
-});
-
-test('activates if the first playable source is HLS', function() {
-  var video;
-  document.querySelector('#qunit-fixture').innerHTML =
-    '<video controls>' +
-      '<source type="slartibartfast$%" src="movie.slarti">' +
-      '<source type="application/x-mpegURL" src="movie.m3u8">' +
-      '<source type="video/mp4" src="movie.mp4">' +
-    '</video>';
-  video = document.querySelector('#qunit-fixture video');
-  player = videojs(video, {
-    flash: {
-      swf: '../node_modules/video.js/dist/video-js/video-js.swf'
-    },
-    techOrder: ['flash']
-  });
-  player.hls();
-
-  ok(player.currentSrc() in videojs.mediaSources, 'media source created');
-});
-
 test('cancels outstanding XHRs when seeking', function() {
-  player.hls('manifest/media.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
   standardXHRResponse(requests[0]);
@@ -721,7 +677,7 @@ test('cancels outstanding XHRs when seeking', function() {
 test('flushes the parser after each segment', function() {
   var flushes = 0;
   // mock out the segment parser
-  videojs.hls.SegmentParser = function() {
+  videojs.Hls.SegmentParser = function() {
     this.getFlvHeader = function() {
       return [];
     };
@@ -732,8 +688,8 @@ test('flushes the parser after each segment', function() {
     this.tagsAvailable = function() {};
   };
 
-  player.hls('manifest/media.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -749,7 +705,7 @@ test('drops tags before the target timestamp when seeking', function() {
       bytes = [];
 
   // mock out the parser and source buffer
-  videojs.hls.SegmentParser = mockSegmentParser(tags);
+  videojs.Hls.SegmentParser = mockSegmentParser(tags);
   window.videojs.SourceBuffer = function() {
     this.appendBuffer = function(chunk) {
       bytes.push(chunk);
@@ -764,8 +720,8 @@ test('drops tags before the target timestamp when seeking', function() {
   // push a tag into the buffer
   tags.push({ pts: 0, bytes: 0 });
 
-  player.hls('manifest/media.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
   standardXHRResponse(requests[0]);
@@ -803,7 +759,7 @@ test('clears pending buffer updates when seeking', function() {
     tags = [{ pts: 0, bytes: 0 }];
 
   // mock out the parser and source buffer
-  videojs.hls.SegmentParser = mockSegmentParser(tags);
+  videojs.Hls.SegmentParser = mockSegmentParser(tags);
   window.videojs.SourceBuffer = function() {
     this.appendBuffer = function(chunk) {
       bytes.push(chunk);
@@ -818,8 +774,8 @@ test('clears pending buffer updates when seeking', function() {
   };
 
   // queue up a tag to be pushed into the buffer (but don't push it yet!)
-  player.hls('manifest/media.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -846,8 +802,8 @@ test('playlist 404 should trigger MEDIA_ERR_NETWORK', function() {
   player.on('error', function() {
     errorTriggered = true;
   });
-  player.hls('manifest/media.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
   requests.pop().respond(404);
@@ -862,9 +818,9 @@ test('playlist 404 should trigger MEDIA_ERR_NETWORK', function() {
 });
 
 test('segment 404 should trigger MEDIA_ERR_NETWORK', function () {
-  player.hls('manifest/media.m3u8');
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
 
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -875,9 +831,9 @@ test('segment 404 should trigger MEDIA_ERR_NETWORK', function () {
 });
 
 test('segment 500 should trigger MEDIA_ERR_ABORTED', function () {
-  player.hls('manifest/media.m3u8');
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
 
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -888,16 +844,16 @@ test('segment 500 should trigger MEDIA_ERR_ABORTED', function () {
 });
 
 test('has no effect if native HLS is available', function() {
-  videojs.hls.supportsNativeHls = true;
-  player.hls('http://example.com/manifest/master.m3u8');
+  videojs.Hls.supportsNativeHls = true;
+  player.src({src: 'http://example.com/manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
 
   ok(!(player.currentSrc() in videojs.mediaSources),
      'no media source was opened');
 });
 
 test('duration is Infinity for live playlists', function() {
-  player.hls('http://example.com/manifest/missingEndlist.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'http://example.com/manifest/missingEndlist.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -912,8 +868,8 @@ test('does not reload playlists with an endlist tag', function() {
   window.setTimeout = function(callback, timeout) {
     callbacks.push({ callback: callback, timeout: timeout });
   };
-  player.hls('manifest/media.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -921,8 +877,8 @@ test('does not reload playlists with an endlist tag', function() {
 });
 
 test('updates the media index when a playlist reloads', function() {
-  player.hls('http://example.com/live-updating.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'http://example.com/live-updating.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -964,8 +920,8 @@ test('mediaIndex is zero before the first segment loads', function() {
     this.open = function() {};
     this.send = function() {};
   };
-  player.hls('http://example.com/first-seg-load.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'http://example.com/first-seg-load.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -973,8 +929,8 @@ test('mediaIndex is zero before the first segment loads', function() {
 });
 
 test('reloads out-of-date live playlists when switching variants', function() {
-  player.hls('http://example.com/master.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'http://example.com/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -1014,8 +970,8 @@ test('does not reload master playlists', function() {
     callbacks.push(callback);
   };
 
-  player.hls('http://example.com/master.m3u8');
-  videojs.mediaSources[player.currentSrc()].trigger({
+  player.src({src: 'http://example.com/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
@@ -1023,20 +979,33 @@ test('does not reload master playlists', function() {
 });
 
 test('if withCredentials option is used, withCredentials is set on the XHR object', function() {
-  player.hls({
-    url: 'http://example.com/media.m3u8',
-    withCredentials: true
-  });
-  videojs.mediaSources[player.currentSrc()].trigger({
-    type: 'sourceopen'
+  stop();
+  player.dispose();
+  var video = document.createElement('video');
+
+  document.querySelector('#qunit-fixture').appendChild(video);
+  player = videojs(video, {
+    flash: {
+      swf: '../node_modules/video.js/dist/video-js/video-js.swf'
+    },
+    hls: {
+      withCredentials: true
+    },
+    techOrder: ['hls']
+  }, function() {
+    player.src({src: 'http://example.com/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+    player.hls.mediaSource.trigger({
+      type: 'sourceopen'
+    });
+    ok(requests[0].withCredentials, "with credentials should be set to true if that option is passed in");
+    start();
   });
-  ok(requests[0].withCredentials, "with credentials should be set to true if that option is passed in");
 });
 
 test('does not break if the playlist has no segments', function() {
-  player.hls('manifest/master.m3u8');
+  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
   try {
-    videojs.mediaSources[player.currentSrc()].trigger({
+    player.hls.mediaSource.trigger({
       type: 'sourceopen'
     });
     requests[0].respond(200, null,

From e5a7649733dc3992a1b1a18b7d4638024ab35c99 Mon Sep 17 00:00:00 2001
From: Gary Katsevman <git@gkatsev.com>
Date: Wed, 21 May 2014 13:54:23 -0400
Subject: [PATCH 09/14] Remove some commented out code

---
 src/videojs-hls.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/videojs-hls.js b/src/videojs-hls.js
index a611d5b87..8f120d710 100644
--- a/src/videojs-hls.js
+++ b/src/videojs-hls.js
@@ -499,13 +499,6 @@ videojs.Hls.prototype.dispose = function() {
   videojs.Flash.prototype.dispose.call(this);
 };
 
-//for (var prop in videojs.Flash) {
-  //videojs.Hls[prop] = videojs.Flash[prop];
-//}
-//for (prop in videojs.Flash.prototype) {
-  //videojs.Hls.prototype[prop] = videojs.Flash[prop];
-//}
-
 videojs.Hls.isSupported = function() {
   return videojs.Flash.isSupported() && videojs.MediaSource;
 };
@@ -625,8 +618,4 @@ resolveUrl = videojs.Hls.resolveUrl = function(basePath, path) {
   return result;
 };
 
-//videojs.Hls.onReady = videojs.Flash.onReady;
-//videojs.Hls.onEvent = videojs.Flash.onEvent;
-//videojs.Hls.onError = videojs.Flash.onError;
-
 })(window, window.videojs, document);

From 7429ce71dfd3d2ba6bd916ceb8882be1f9f8f557 Mon Sep 17 00:00:00 2001
From: David LaPalomento <dlapalomento@gmail.com>
Date: Wed, 21 May 2014 16:23:04 -0400
Subject: [PATCH 10/14] Fix tests Make the withCredentials test synchronous so
 that karma doesn't hang on it. Pull out test player creation so that it can
 be re-used. Re-indented player.src invocations.

---
 test/videojs-hls_test.js | 276 ++++++++++++++++++++++++++++-----------
 1 file changed, 198 insertions(+), 78 deletions(-)

diff --git a/test/videojs-hls_test.js b/test/videojs-hls_test.js
index 958e58970..3ce799478 100644
--- a/test/videojs-hls_test.js
+++ b/test/videojs-hls_test.js
@@ -1,4 +1,5 @@
 (function(window, videojs, undefined) {
+  'use strict';
   /*
     ======== A Handy Little QUnit Reference ========
     http://api.qunitjs.com/
@@ -30,6 +31,29 @@ var
   requests,
   xhr,
 
+  createPlayer = function(options) {
+    var tech, video, player;
+    video = document.createElement('video');
+    document.querySelector('#qunit-fixture').appendChild(video);
+    player = videojs(video, {
+      flash: {
+        swf: ''
+      },
+      techOrder: ['hls'],
+      hls: options || {}
+    });
+
+    player.buffered = function() {
+      return videojs.createTimeRange(0, 0);
+    };
+
+    tech = player.el().querySelector('.vjs-tech');
+    tech.vjs_getProperty = function() {};
+    tech.vjs_src = function() {};
+    videojs.Flash.onReady(tech.id);
+
+    return player;
+  },
   standardXHRResponse = function(request) {
     if (!request.url) {
       return;
@@ -96,20 +120,6 @@ module('HLS', {
       this.abort = function() {};
     };
 
-    // create the test player
-    var video = document.createElement('video');
-    document.querySelector('#qunit-fixture').appendChild(video);
-    player = videojs(video, {
-      flash: {
-        swf: ''//'../node_modules/video.js/dist/video-js/video-js.swf'
-      },
-      techOrder: ['hls']
-    });
-
-    player.buffered = function() {
-      return videojs.createTimeRange(0, 0);
-    };
-
     // store functionality that some tests need to mock
     oldSegmentParser = videojs.Hls.SegmentParser;
     oldSetTimeout = window.setTimeout;
@@ -121,10 +131,8 @@ module('HLS', {
       requests.push(xhr);
     };
 
-    var tech = player.el().querySelector('.vjs-tech');
-    tech.vjs_getProperty = function() {};
-    tech.vjs_src = function() {};
-    videojs.Flash.onReady(tech.id);
+    // create the test player
+    player = createPlayer();
   },
 
   teardown: function() {
@@ -144,7 +152,10 @@ test('starts playing if autoplay is specified', function() {
     plays++;
   };
   player.options().autoplay = true;
-  player.src({src: 'manifest/playlist.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/playlist.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -160,7 +171,10 @@ test('creates a PlaylistLoader on init', function() {
   });
 
   ok(!player.hls.playlists, 'waits for set src to create the loader');
-  player.src({src:'manifest/playlist.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src:'manifest/playlist.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -182,7 +196,10 @@ test('sets the duration if one is available on the playlist', function() {
     }
     calls++;
   };
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -201,7 +218,10 @@ test('calculates the duration if needed', function() {
     }
     durations.push(duration);
   };
-  player.src({src: 'http://example.com/manifest/missingExtinf.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'http://example.com/manifest/missingExtinf.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -214,7 +234,10 @@ test('calculates the duration if needed', function() {
 });
 
 test('starts downloading a segment on loadedmetadata', function() {
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.buffered = function() {
     return videojs.createTimeRange(0, 0);
   };
@@ -232,7 +255,10 @@ test('starts downloading a segment on loadedmetadata', function() {
 });
 
 test('recognizes absolute URIs and requests them unmodified', function() {
-  player.src({src: 'manifest/absoluteUris.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/absoluteUris.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -245,7 +271,10 @@ test('recognizes absolute URIs and requests them unmodified', function() {
 });
 
 test('recognizes domain-relative URLs', function() {
-  player.src({src: 'manifest/domainUris.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/domainUris.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -260,14 +289,20 @@ test('recognizes domain-relative URLs', function() {
 test('re-initializes the tech for each source', function() {
   var firstPlaylists, secondPlaylists, firstMSE, secondMSE;
 
-  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
   firstPlaylists = player.hls.playlists;
   firstMSE = player.hls.mediaSource;
 
-  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -283,7 +318,10 @@ test('triggers an error when a master playlist request errors', function() {
   player.on('error', function() {
     error = player.hls.error;
   });
-  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -294,7 +332,10 @@ test('triggers an error when a master playlist request errors', function() {
 });
 
 test('downloads media playlists after loading the master', function() {
-  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -324,7 +365,10 @@ test('timeupdates do not check to fill the buffer until a media playlist is read
     };
     this.send = function() {};
   };
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -335,7 +379,10 @@ test('timeupdates do not check to fill the buffer until a media playlist is read
 });
 
 test('calculates the bandwidth after downloading a segment', function() {
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -352,7 +399,10 @@ test('calculates the bandwidth after downloading a segment', function() {
 
 test('selects a playlist after segment downloads', function() {
   var calls = 0;
-  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.selectPlaylist = function() {
     calls++;
     return player.hls.playlists.master.playlists[0];
@@ -382,7 +432,10 @@ test('selects a playlist after segment downloads', function() {
 test('moves to the next segment if there is a network error', function() {
   var mediaIndex;
 
-  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -401,7 +454,10 @@ test('updates the duration after switching playlists', function() {
   var
     calls = 0,
     selectedPlaylist = false;
-  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.selectPlaylist = function() {
     selectedPlaylist = true;
     return player.hls.playlists.master.playlists[1];
@@ -433,7 +489,10 @@ test('downloads additional playlists if required', function() {
     playlist = {
       uri: 'media3.m3u8'
     };
-  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -471,7 +530,10 @@ test('downloads additional playlists if required', function() {
 
 test('selects a playlist below the current bandwidth', function() {
   var playlist;
-  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -493,7 +555,10 @@ test('selects a playlist below the current bandwidth', function() {
 
 test('raises the minimum bitrate for a stream proportionially', function() {
   var playlist;
-  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -515,7 +580,10 @@ test('raises the minimum bitrate for a stream proportionially', function() {
 
 test('uses the lowest bitrate if no other is suitable', function() {
   var playlist;
-  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -535,7 +603,10 @@ test('uses the lowest bitrate if no other is suitable', function() {
 test('selects the correct rendition by player dimensions', function() {
   var playlist;
 
-  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
 
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
@@ -565,7 +636,10 @@ test('selects the correct rendition by player dimensions', function() {
 
 
 test('does not download the next segment if the buffer is full', function() {
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.currentTime = function() {
     return 15;
   };
@@ -584,7 +658,10 @@ test('does not download the next segment if the buffer is full', function() {
 });
 
 test('downloads the next segment if the buffer is getting low', function() {
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -612,7 +689,10 @@ test('downloads the next segment if the buffer is getting low', function() {
 });
 
 test('stops downloading segments at the end of the playlist', function() {
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -626,7 +706,10 @@ test('stops downloading segments at the end of the playlist', function() {
 
 test('only makes one segment request at a time', function() {
   var openedXhrs = 0;
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -650,7 +733,10 @@ test('only makes one segment request at a time', function() {
 });
 
 test('cancels outstanding XHRs when seeking', function() {
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -688,7 +774,10 @@ test('flushes the parser after each segment', function() {
     this.tagsAvailable = function() {};
   };
 
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -720,7 +809,10 @@ test('drops tags before the target timestamp when seeking', function() {
   // push a tag into the buffer
   tags.push({ pts: 0, bytes: 0 });
 
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -774,7 +866,10 @@ test('clears pending buffer updates when seeking', function() {
   };
 
   // queue up a tag to be pushed into the buffer (but don't push it yet!)
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -802,7 +897,10 @@ test('playlist 404 should trigger MEDIA_ERR_NETWORK', function() {
   player.on('error', function() {
     errorTriggered = true;
   });
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -818,7 +916,10 @@ test('playlist 404 should trigger MEDIA_ERR_NETWORK', function() {
 });
 
 test('segment 404 should trigger MEDIA_ERR_NETWORK', function () {
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
 
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
@@ -831,7 +932,10 @@ test('segment 404 should trigger MEDIA_ERR_NETWORK', function () {
 });
 
 test('segment 500 should trigger MEDIA_ERR_ABORTED', function () {
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
 
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
@@ -845,14 +949,20 @@ test('segment 500 should trigger MEDIA_ERR_ABORTED', function () {
 
 test('has no effect if native HLS is available', function() {
   videojs.Hls.supportsNativeHls = true;
-  player.src({src: 'http://example.com/manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'http://example.com/manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
 
   ok(!(player.currentSrc() in videojs.mediaSources),
      'no media source was opened');
 });
 
 test('duration is Infinity for live playlists', function() {
-  player.src({src: 'http://example.com/manifest/missingEndlist.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'http://example.com/manifest/missingEndlist.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -868,7 +978,10 @@ test('does not reload playlists with an endlist tag', function() {
   window.setTimeout = function(callback, timeout) {
     callbacks.push({ callback: callback, timeout: timeout });
   };
-  player.src({src: 'manifest/media.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -877,7 +990,10 @@ test('does not reload playlists with an endlist tag', function() {
 });
 
 test('updates the media index when a playlist reloads', function() {
-  player.src({src: 'http://example.com/live-updating.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'http://example.com/live-updating.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -920,7 +1036,10 @@ test('mediaIndex is zero before the first segment loads', function() {
     this.open = function() {};
     this.send = function() {};
   };
-  player.src({src: 'http://example.com/first-seg-load.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'http://example.com/first-seg-load.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -929,7 +1048,10 @@ test('mediaIndex is zero before the first segment loads', function() {
 });
 
 test('reloads out-of-date live playlists when switching variants', function() {
-  player.src({src: 'http://example.com/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'http://example.com/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
@@ -970,40 +1092,38 @@ test('does not reload master playlists', function() {
     callbacks.push(callback);
   };
 
-  player.src({src: 'http://example.com/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'http://example.com/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   player.hls.mediaSource.trigger({
     type: 'sourceopen'
   });
 
-  strictEqual(callbacks.length, 0, 'no reload scheduled');
+  strictEqual(callbacks.length,
+              0, 'no reload scheduled');
 });
 
 test('if withCredentials option is used, withCredentials is set on the XHR object', function() {
-  stop();
   player.dispose();
-  var video = document.createElement('video');
-
-  document.querySelector('#qunit-fixture').appendChild(video);
-  player = videojs(video, {
-    flash: {
-      swf: '../node_modules/video.js/dist/video-js/video-js.swf'
-    },
-    hls: {
-      withCredentials: true
-    },
-    techOrder: ['hls']
-  }, function() {
-    player.src({src: 'http://example.com/media.m3u8', type: 'application/vnd.apple.mpegurl'});
-    player.hls.mediaSource.trigger({
-      type: 'sourceopen'
-    });
-    ok(requests[0].withCredentials, "with credentials should be set to true if that option is passed in");
-    start();
+  player = createPlayer({
+    withCredentials: true
+  });
+  player.src({
+    src: 'http://example.com/media.m3u8',
+    type: 'application/vnd.apple.mpegurl'
   });
+  player.hls.mediaSource.trigger({
+    type: 'sourceopen'
+  });
+  ok(requests[0].withCredentials, "with credentials should be set to true if that option is passed in");
 });
 
 test('does not break if the playlist has no segments', function() {
-  player.src({src: 'manifest/master.m3u8', type: 'application/vnd.apple.mpegurl'});
+  player.src({
+    src: 'manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
   try {
     player.hls.mediaSource.trigger({
       type: 'sourceopen'

From d1695461140fe98a93e15c4bbb79f8d7b91b845e Mon Sep 17 00:00:00 2001
From: David LaPalomento <dlapalomento@gmail.com>
Date: Wed, 21 May 2014 17:04:01 -0400
Subject: [PATCH 11/14] Use karma for all tests. Add a tests for dispose() Get
 rid of grunt-contrib-qunit because it was inexplicably failing in phantomjs.
 It's still possible to test in phantom through karma and the tests all pass
 there. Add test cases for object disposal on the tech and the playlist
 loader.

---
 Gruntfile.js                 | 10 +++-------
 package.json                 |  1 -
 test/playlist-loader_test.js | 27 +++++++++++++++++++++++++++
 test/videojs-hls_test.js     | 18 ++++++++++++++++++
 4 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index bfecfdff4..a9e16ae56 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -45,9 +45,6 @@ module.exports = function(grunt) {
         dest: 'dist/videojs.hls.min.js'
       }
     },
-    qunit: {
-      files: ['test/**/*.html', '!test/perf.html', '!test/muxer/**']
-    },
     jshint: {
       gruntfile: {
         options: {
@@ -93,11 +90,11 @@ module.exports = function(grunt) {
       },
       src: {
         files: '<%= jshint.src.src %>',
-        tasks: ['jshint:src', 'qunit']
+        tasks: ['jshint:src', 'test']
       },
       test: {
         files: '<%= jshint.test.src %>',
-        tasks: ['jshint:test', 'qunit']
+        tasks: ['jshint:test', 'test']
       }
     },
     concurrent: {
@@ -194,7 +191,6 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-qunit');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-connect');
@@ -255,7 +251,7 @@ module.exports = function(grunt) {
                      ['clean',
                       'jshint',
                       'manifests-to-js',
-                      'qunit',
+                      'test',
                       'concat',
                       'uglify']);
 
diff --git a/package.json b/package.json
index 390f276f3..5a7e5493a 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,6 @@
     "grunt-contrib-concat": "~0.3.0",
     "grunt-contrib-connect": "~0.6.0",
     "grunt-contrib-jshint": "~0.6.0",
-    "grunt-contrib-qunit": "~0.2.0",
     "grunt-contrib-uglify": "~0.2.0",
     "grunt-contrib-watch": "~0.4.0",
     "grunt-karma": "~0.6.2",
diff --git a/test/playlist-loader_test.js b/test/playlist-loader_test.js
index 21a02fe4a..5012bbaaf 100644
--- a/test/playlist-loader_test.js
+++ b/test/playlist-loader_test.js
@@ -378,4 +378,31 @@
       loader.media('unrecognized.m3u8');
     }, 'throws an error');
   });
+
+  test('dispose cancels the refresh timeout', function() {
+    var loader = new videojs.Hls.PlaylistLoader('live.m3u8');
+    requests.pop().respond(200, null,
+                           '#EXTM3U\n' +
+                           '#EXT-X-MEDIA-SEQUENCE:0\n' +
+                           '#EXTINF:10,\n' +
+                           '0.ts\n');
+    loader.dispose();
+    // a lot of time passes...
+    clock.tick(15 * 1000);
+
+    strictEqual(requests.length, 0, 'no refresh request was made');
+  });
+
+  test('dispose aborts pending refresh requests', function() {
+    var loader = new videojs.Hls.PlaylistLoader('live.m3u8');
+    requests.pop().respond(200, null,
+                           '#EXTM3U\n' +
+                           '#EXT-X-MEDIA-SEQUENCE:0\n' +
+                           '#EXTINF:10,\n' +
+                           '0.ts\n');
+    clock.tick(10 * 1000);
+
+    loader.dispose();
+    ok(requests[0].aborted, 'refresh request aborted');
+  });
 })(window);
diff --git a/test/videojs-hls_test.js b/test/videojs-hls_test.js
index 3ce799478..d0e00c712 100644
--- a/test/videojs-hls_test.js
+++ b/test/videojs-hls_test.js
@@ -1140,4 +1140,22 @@ test('does not break if the playlist has no segments', function() {
   strictEqual(requests.length, 1, 'no requests for non-existent segments were queued');
 });
 
+test('disposes the playlist loader', function() {
+  var disposes = 0, player;
+  player = createPlayer();
+  player.src({
+    src: 'manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
+  player.hls.mediaSource.trigger({
+    type: 'sourceopen'
+  });
+  player.hls.playlists.dispose = function() {
+    disposes++;
+  };
+
+  player.dispose();
+  strictEqual(disposes, 1, 'disposed playlist loader');
+});
+
 })(window, window.videojs);

From ca5e4ffe320aa1fb3aef5433e583c33d536a7b59 Mon Sep 17 00:00:00 2001
From: David LaPalomento <dlapalomento@gmail.com>
Date: Wed, 21 May 2014 17:12:44 -0400
Subject: [PATCH 12/14] Remove supportsNativeHls The video.js tech selection
 now manages whether the HLS polyfill is used or not, so we don't need to
 detect HLS support in the project itself.

---
 src/videojs-hls.js       | 17 -----------------
 test/videojs-hls_test.js | 11 -----------
 2 files changed, 28 deletions(-)

diff --git a/src/videojs-hls.js b/src/videojs-hls.js
index 8f120d710..3cc88bcfe 100644
--- a/src/videojs-hls.js
+++ b/src/videojs-hls.js
@@ -507,23 +507,6 @@ videojs.Hls.canPlaySource = function(srcObj) {
   return mpegurlRE.test(srcObj.type) || videojs.Flash.canPlaySource.call(this, srcObj);
 };
 
-videojs.Hls.supportsNativeHls = (function() {
-  var
-    video = document.createElement('video'),
-    xMpegUrl,
-    vndMpeg;
-
-  // native HLS is definitely not supported if HTML5 video isn't
-  if (!videojs.Html5.isSupported()) {
-    return false;
-  }
-
-  xMpegUrl = video.canPlayType('application/x-mpegURL');
-  vndMpeg = video.canPlayType('application/vnd.apple.mpegURL');
-  return (/probably|maybe/).test(xMpegUrl) ||
-    (/probably|maybe/).test(vndMpeg);
-})();
-
 /**
  * Creates and sends an XMLHttpRequest.
  * @param options {string | object} if this argument is a string, it
diff --git a/test/videojs-hls_test.js b/test/videojs-hls_test.js
index d0e00c712..f2c36fc7d 100644
--- a/test/videojs-hls_test.js
+++ b/test/videojs-hls_test.js
@@ -947,17 +947,6 @@ test('segment 500 should trigger MEDIA_ERR_ABORTED', function () {
   equal(4, player.hls.error.code, 'Player error code should be set to MediaError.MEDIA_ERR_ABORTED');
 });
 
-test('has no effect if native HLS is available', function() {
-  videojs.Hls.supportsNativeHls = true;
-  player.src({
-    src: 'http://example.com/manifest/master.m3u8',
-    type: 'application/vnd.apple.mpegurl'
-  });
-
-  ok(!(player.currentSrc() in videojs.mediaSources),
-     'no media source was opened');
-});
-
 test('duration is Infinity for live playlists', function() {
   player.src({
     src: 'http://example.com/manifest/missingEndlist.m3u8',

From 0bac2982b186dc74f7b767e5c8692327b0274dd1 Mon Sep 17 00:00:00 2001
From: David LaPalomento <dlapalomento@gmail.com>
Date: Wed, 21 May 2014 17:19:44 -0400
Subject: [PATCH 13/14] Convert player.hls references to this When in the scope
 of the tech, use `this` to reference the tech instead of going through the
 player.

---
 src/videojs-hls.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/videojs-hls.js b/src/videojs-hls.js
index 3cc88bcfe..f34f3b4e1 100644
--- a/src/videojs-hls.js
+++ b/src/videojs-hls.js
@@ -476,7 +476,7 @@ videojs.Hls.prototype.src = function(src) {
       src: videojs.URL.createObjectURL(mediaSource),
       type: "video/flv"
     };
-    player.hls.mediaSource = mediaSource;
+    this.mediaSource = mediaSource;
     initSource(player, mediaSource, src);
     this.ready(function() {
       this.el().vjs_src(source.src);
@@ -485,7 +485,7 @@ videojs.Hls.prototype.src = function(src) {
 };
 
 videojs.Hls.prototype.duration = function() {
-  var playlists = this.player().hls.playlists;
+  var playlists = this.playlists;
   if (playlists) {
     return totalDuration(playlists.media());
   }
@@ -493,8 +493,8 @@ videojs.Hls.prototype.duration = function() {
 };
 
 videojs.Hls.prototype.dispose = function() {
-  if (this.player().hls.playlists) {
-    this.player().hls.playlists.dispose();
+  if (this.playlists) {
+    this.playlists.dispose();
   }
   videojs.Flash.prototype.dispose.call(this);
 };

From d30df95f82eb035a487588ed06e8d69fca716ed5 Mon Sep 17 00:00:00 2001
From: David LaPalomento <dlapalomento@gmail.com>
Date: Wed, 21 May 2014 17:21:26 -0400
Subject: [PATCH 14/14] Use the production version of video.js on the example
 page Using the dev version can lead to accidental dependencies on non-public
 functionality.

---
 example.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.html b/example.html
index fc9ff7780..a017a1e64 100644
--- a/example.html
+++ b/example.html
@@ -7,7 +7,7 @@
   <link href="node_modules/video.js/dist/video-js/video-js.css" rel="stylesheet">
   
   <!-- video.js -->
-  <script src="node_modules/video.js/dist/video-js/video.dev.js"></script>
+  <script src="node_modules/video.js/dist/video-js/video.js"></script>
 
   <!-- Media Sources plugin -->
   <script src="node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js"></script>