only use source options for setting up eme

forbesjo · Mar 28, 2018 · add4e66 · add4e66
1 parent d9a8587
commit add4e66
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/videojs-http-streaming.js b/src/videojs-http-streaming.js
@@ -175,11 +175,11 @@ const setupEmeOptions = (hlsHandler) => {
   const player = videojs.players[hlsHandler.tech_.options_.playerId];
 
   if (player.eme) {
-    player.eme.options = videojs.mergeOptions(player.eme.options, emeOptions(
+    player.eme.options = emeOptions(
       hlsHandler.source_.keySystems,
       hlsHandler.playlists.media(),
       hlsHandler.masterPlaylistController_.mediaTypes_.AUDIO.activePlaylistLoader.media()
-    ));
+    );
   }
 };
 

diff --git a/test/videojs-http-streaming.test.js b/test/videojs-http-streaming.test.js
@@ -2894,7 +2894,6 @@ QUnit.test('configures eme if present on selectedinitialmedia', function(assert)
   this.player.tech_.hls.masterPlaylistController_.trigger('selectedinitialmedia');
 
   assert.deepEqual(this.player.eme.options, {
-    previousSetting: 1,
     keySystems: {
       keySystem1: {
         url: 'url1',
@@ -2903,7 +2902,7 @@ QUnit.test('configures eme if present on selectedinitialmedia', function(assert)
         pssh: 'test'
       }
     }
-  }, 'set eme options');
+  }, 'set eme options and ignores previous setting');
 });
 
 QUnit.module('HLS Integration', {