hls.js 1.5.14-0.canary.10643 → 1.5.14-0.canary.10646

package/dist/hls.js

@@ -523,7 +523,7 @@
       // Some browsers don't allow to use bind on console object anyway
       // fallback to default if needed
       try {
-        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.5.14-0.canary.10643");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.5.14-0.canary.10646");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -17341,7 +17341,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.5.14-0.canary.10643";
+  var version = "1.5.14-0.canary.10646";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -24271,6 +24271,9 @@
               keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = keySessionContextPromise.then(function () {
                 return _this.generateRequestWithPreferredKeySession(keyContext, initDataType, initData, 'encrypted-event-key-match');
               });
+              keySessionContextPromise.catch(function (error) {
+                return _this.handleError(error);
+              });
               return 1; // break
             }
           },
@@ -24300,10 +24303,10 @@
               return _this.generateRequestWithPreferredKeySession(keySessionContext, initDataType, initData, 'encrypted-event-no-match');
             });
           });
+          keySessionContextPromise.catch(function (error) {
+            return _this.handleError(error);
+          });
         }
-        keySessionContextPromise.catch(function (error) {
-          return _this.handleError(error);
-        });
       };
       _this.onWaitingForKey = function (event) {
         _this.log("\"" + event.type + "\" event");
@@ -24667,8 +24670,11 @@
         _this8.log("\"" + messageType + "\" message event for session \"" + keySession.sessionId + "\" message size: " + message.byteLength);
         if (messageType === 'license-request' || messageType === 'license-renewal') {
           _this8.renewLicense(context, message).catch(function (error) {
-            _this8.handleError(error);
-            licenseStatus.emit('error', error);
+            if (licenseStatus.eventNames().length) {
+              licenseStatus.emit('error', error);
+            } else {
+              _this8.handleError(error);
+            }
           });
         } else if (messageType === 'license-release') {
           if (context.keySystem === KeySystems.FAIRPLAY) {
@@ -24978,6 +24984,8 @@
 
       // keep reference of media
       this.media = media;
+      media.removeEventListener('encrypted', this.onMediaEncrypted);
+      media.removeEventListener('waitingforkey', this.onWaitingForKey);
       media.addEventListener('encrypted', this.onMediaEncrypted);
       media.addEventListener('waitingforkey', this.onWaitingForKey);
     };