Save options from contribEme calls

src/plugin.js

@@ -2,6 +2,8 @@ import videojs from 'video.js';
 import {standard5July2016} from './eme';
 import fairplay from './fairplay';
 
+let savedOptions;
+
 const handleEncryptedEvent = (event, options) => {
   standard5July2016({
     video: event.target,
@@ -30,19 +32,19 @@ const handleWebKitNeedKeyEvent = (event, options) => {
  * @param    {Player} player
  * @param    {Object} [options={}]
  */
-const onPlayerReady = (player, options) => {
+const onPlayerReady = (player) => {
   if (!player.tech_.el_.techName_ === 'Html5') {
     return;
   }
 
   // Support EME 05 July 2016
   player.tech_.el_.addEventListener('encrypted', (event) => {
-    handleEncryptedEvent(event, options);
+    handleEncryptedEvent(event, savedOptions);
   });
   // Support Safari EME with FairPlay
   // (also used in early Chrome or Chrome with EME disabled flag)
   player.tech_.el_.addEventListener('webkitneedkey', (event) => {
-    handleWebKitNeedKeyEvent(event, options);
+    handleWebKitNeedKeyEvent(event, savedOptions);
   });
 };
 
@@ -59,9 +61,14 @@ const onPlayerReady = (player, options) => {
  *           An object of options left to the plugin author to define.
  */
 const contribEme = function(options) {
-  this.ready(() => {
-    onPlayerReady(this, videojs.mergeOptions({}, options));
-  });
+  // savedOptions doubles as a state to tell us if we've listened for player ready yet
+  if (!savedOptions) {
+    this.ready(() => {
+      onPlayerReady(this);
+    });
+  }
+
+  savedOptions = options;
 };
 
 // Register the plugin with video.js.