Let techOrder determine the mode to use

When a browser could support HTML or Flash based playback modes, allow video.js's techOrder to have precedence. It's very handy to be able to override the mode selection for debugging purposes, for instance.

@@ -25,7 +25,7 @@ keyFailed = function(key) {
 };
 };
 
 
 videojs.Hls = videojs.extends(Component, {
 videojs.Hls = videojs.extends(Component, {
-  constructor: function(tech, source) {
+  constructor: function(tech, options) {
     var self = this, _player;
     var self = this, _player;
 
 
     Component.call(this, tech);
     Component.call(this, tech);
@@ -44,7 +44,8 @@ videojs.Hls = videojs.extends(Component, {
       }
       }
     }
     }
     this.tech_ = tech;
     this.tech_ = tech;
-    this.source_ = source;
+    this.source_ = options.source;
+    this.mode_ = options.mode;
     this.bytesReceived = 0;
     this.bytesReceived = 0;
 
 
     // loadingState_ tracks how far along the buffering process we
     // loadingState_ tracks how far along the buffering process we
@@ -87,28 +88,33 @@ videojs.Hls.canPlaySource = function() {
  * the browser it is running in. It is not necessary to use or modify
  * the browser it is running in. It is not necessary to use or modify
  * this object in normal usage.
  * this object in normal usage.
  */
  */
-videojs.HlsSourceHandler = {
-  canHandleSource: function(srcObj) {
-    var mpegurlRE = /^application\/(?:x-|vnd\.apple\.)mpegurl/i;
-
-    // favor native HLS support if it's available
-    if (videojs.Hls.supportsNativeHls) {
-      return false;
+videojs.HlsSourceHandler = function(mode) {
+  return {
+    canHandleSource: function(srcObj) {
+      var mpegurlRE = /^application\/(?:x-|vnd\.apple\.)mpegurl/i;
+
+      // favor native HLS support if it's available
+      if (videojs.Hls.supportsNativeHls) {
+        return false;
+      }
+      return mpegurlRE.test(srcObj.type);
+    },
+    handleSource: function(source, tech) {
+      tech.hls = new videojs.Hls(tech, {
+        source: source,
+        mode: mode
+      });
+      tech.hls.src(source.src);
+      return tech.hls;
     }
     }
-    return mpegurlRE.test(srcObj.type);
-  },
-  handleSource: function(source, tech) {
-    tech.hls = new videojs.Hls(tech, source);
-    tech.hls.src(source.src);
-    return tech.hls;
-  }
+  };
 };
 };
-// register with the appropriate tech
+
+// register source handlers with the appropriate techs
 if (videojs.MediaSource.supportsNativeMediaSources()) {
 if (videojs.MediaSource.supportsNativeMediaSources()) {
-  videojs.getComponent('Html5').registerSourceHandler(videojs.HlsSourceHandler);
-} else {
-  videojs.getComponent('Flash').registerSourceHandler(videojs.HlsSourceHandler);
+  videojs.getComponent('Html5').registerSourceHandler(videojs.HlsSourceHandler('html5'));
 }
 }
+videojs.getComponent('Flash').registerSourceHandler(videojs.HlsSourceHandler('flash'));
 
 
 // the desired length of video to maintain in the buffer, in seconds
 // the desired length of video to maintain in the buffer, in seconds
 videojs.Hls.GOAL_BUFFER_LENGTH = 30;
 videojs.Hls.GOAL_BUFFER_LENGTH = 30;
@@ -121,7 +127,7 @@ videojs.Hls.prototype.src = function(src) {
     return;
     return;
   }
   }
 
 
-  this.mediaSource = new videojs.MediaSource();
+  this.mediaSource = new videojs.MediaSource({ mode: this.mode_ });
   this.segmentBuffer_ = [];
   this.segmentBuffer_ = [];
 
 
   // if the stream contains ID3 metadata, expose that as a metadata
   // if the stream contains ID3 metadata, expose that as a metadata

@@ -2510,19 +2510,21 @@ test('aborts the source buffer on disposal', function() {
 });
 });
 
 
 test('the source handler supports HLS mime types', function() {
 test('the source handler supports HLS mime types', function() {
-  ok(videojs.HlsSourceHandler.canHandleSource({
-    type: 'aPplicatiOn/x-MPegUrl'
-  }), 'supports x-mpegurl');
-  ok(videojs.HlsSourceHandler.canHandleSource({
-    type: 'aPplicatiOn/VnD.aPPle.MpEgUrL'
-  }), 'supports vnd.apple.mpegurl');
-
-  ok(!(videojs.HlsSourceHandler.canHandleSource({
-    type: 'video/mp4'
-  }) instanceof videojs.Hls), 'does not support mp4');
-  ok(!(videojs.HlsSourceHandler.canHandleSource({
-    type: 'video/x-flv'
-  }) instanceof videojs.Hls), 'does not support flv');
+  ['html5', 'flash'].forEach(function(techName) {
+    ok(videojs.HlsSourceHandler(techName).canHandleSource({
+      type: 'aPplicatiOn/x-MPegUrl'
+    }), 'supports x-mpegurl');
+    ok(videojs.HlsSourceHandler(techName).canHandleSource({
+      type: 'aPplicatiOn/VnD.aPPle.MpEgUrL'
+    }), 'supports vnd.apple.mpegurl');
+
+    ok(!(videojs.HlsSourceHandler(techName).canHandleSource({
+      type: 'video/mp4'
+    }) instanceof videojs.Hls), 'does not support mp4');
+    ok(!(videojs.HlsSourceHandler(techName).canHandleSource({
+      type: 'video/x-flv'
+    }) instanceof videojs.Hls), 'does not support flv');
+  });
 });
 });
 
 
 test('has no effect if native HLS is available', function() {
 test('has no effect if native HLS is available', function() {