Diassociate config with tech

streamroot · Feb 26, 2019 · e6cb40c · e6cb40c
1 parent edea114
commit e6cb40c
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/lib/videojs-hlsjs-plugin.js b/lib/videojs-hlsjs-plugin.js
@@ -343,16 +343,17 @@ var registerSourceHandler = function (videojs) {
         }
 
         function _initHlsjs() {
-            var hlsjsConfigRef = tech.options_.hlsjsConfig;
+            var hlsjsConfigRef = _player.srOptions_ && _player.srOptions_.hlsjsConfig || tech.options_.hlsjsConfig;
             // NOTE: Hls.js will write to the reference thus change the object for later streams
             _hlsjsConfig = hlsjsConfigRef ? _oneLevelObjClone(hlsjsConfigRef) : {};
 
             if (['', 'auto'].indexOf(_video.preload) === -1 && !_video.autoplay && _hlsjsConfig.autoStartLoad === undefined) {
                 _hlsjsConfig.autoStartLoad = false;
             }
 
-            if (tech.options_.captionConfig) {
-                _hlsjsConfig.cueHandler = _createCueHandler(tech.options_.captionConfig);
+            var captionConfig = _player.srOptions_ && _player.srOptions_.captionConfig || tech.options_.captionConfig;
+            if (captionConfig) {
+                _hlsjsConfig.cueHandler = _createCueHandler(captionConfig);
             }
 
             // If the user explicitely sets autoStartLoad to false, we're not going to enter the if block above, that's why we have a separate if block here to set the 'play' listener
@@ -530,16 +531,17 @@ function streamrootHlsjsConfigHandler(options) {
         return;
     }
 
-    if (!player.options_.html5) {
-        player.options_.html5 = {};
+
+    if (!player.srOptions_) {
+        player.srOptions_ = {};
     }
 
-    if (!player.options_.html5.hlsjsConfig) {
-        player.options_.html5.hlsjsConfig = options.hlsjsConfig;
+    if (!player.srOptions_.hlsjsConfig) {
+        player.srOptions_.hlsjsConfig = options.hlsjsConfig;
     }
 
-    if (!player.options_.html5.captionConfig) {
-        player.options_.html5.captionConfig = options.captionConfig;
+    if (!player.srOptions_.captionConfig) {
+        player.srOptions_.captionConfig = options.captionConfig;
     }
 }