shaka-player 4.13.1 → 4.13.2

package/eslint.config.mjs

@@ -81,7 +81,6 @@ export default [
     },
     rules: {
       // Things the compiler already takes care of, with more precision: {{{
-      'no-console': 'off',
       'no-eq-null': 'off',
       'no-eval': 'off',
       'no-undef': 'off',
@@ -132,6 +131,7 @@ export default [
       'guard-for-in': 'off',
       'no-alert': 'error',
       'no-caller': 'error',
+      'no-console': 'error',
       'no-div-regex': 'error',
       'no-extend-native': 'error', // May conflict with future polyfills
       'no-extra-label': 'error',
@@ -340,4 +340,17 @@ export default [
       'jsdoc/require-jsdoc': 'off',
     },
   },
+  {
+    files: [
+      'karma.conf.js',
+      'build/**/*.js',
+      'demo/**/*.js',
+      'lib/debug/asserts.js',
+      'lib/debug/log.js',
+      'test/**/**.js',
+    ],
+    rules: {
+      'no-console': 'off',
+    },
+  },
 ];

package/lib/cast/cast_proxy.js

@@ -81,17 +81,21 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
     this.compiledToExternNames_ = new Map();
 
     /** @private {shaka.cast.CastSender} */
-    this.sender_ = new shaka.cast.CastSender(
-        receiverAppId,
-        () => this.onCastStatusChanged_(),
-        () => this.onFirstCastStateUpdate_(),
-        (targetName, event) => this.onRemoteEvent_(targetName, event),
-        () => this.onResumeLocal_(),
-        () => this.getInitState_(),
-        androidReceiverCompatible);
-
+    this.sender_ = null;
 
-    this.init_();
+    if (window.chrome) {
+      this.sender_ = new shaka.cast.CastSender(
+          receiverAppId,
+          () => this.onCastStatusChanged_(),
+          () => this.onFirstCastStateUpdate_(),
+          (targetName, event) => this.onRemoteEvent_(targetName, event),
+          () => this.onResumeLocal_(),
+          () => this.getInitState_(),
+          androidReceiverCompatible);
+      this.init_();
+    } else {
+      this.initWithoutSender_();
+    }
   }
 
   /**
@@ -163,6 +167,9 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @export
    */
   canCast() {
+    if (!this.sender_) {
+      return false;
+    }
     return this.sender_.apiReady() && this.sender_.hasReceivers();
   }
 
@@ -171,6 +178,9 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @export
    */
   isCasting() {
+    if (!this.sender_) {
+      return false;
+    }
     return this.sender_.isCasting();
   }
 
@@ -179,6 +189,9 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @export
    */
   receiverName() {
+    if (!this.sender_) {
+      return '';
+    }
     return this.sender_.receiverName();
   }
 
@@ -188,6 +201,9 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @export
    */
   async cast() {
+    if (!this.sender_) {
+      return;
+    }
     // TODO: transfer manually-selected tracks?
     // TODO: transfer side-loaded text tracks?
 
@@ -208,6 +224,9 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @export
    */
   setAppData(appData) {
+    if (!this.sender_) {
+      return;
+    }
     this.sender_.setAppData(appData);
   }
 
@@ -216,6 +235,9 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @export
    */
   suggestDisconnect() {
+    if (!this.sender_) {
+      return;
+    }
     this.sender_.showDisconnectDialog();
   }
 
@@ -224,6 +246,9 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @export
    */
   forceDisconnect() {
+    if (!this.sender_) {
+      return;
+    }
     this.sender_.forceDisconnect();
   }
 
@@ -243,6 +268,10 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
     this.receiverAppId_ = newAppId;
     this.androidReceiverCompatible_ = newCastAndroidReceiver;
 
+    if (!this.sender_) {
+      return;
+    }
+
     // Destroy the old sender
     this.sender_.forceDisconnect();
     await this.sender_.destroy();
@@ -262,6 +291,15 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
     this.sender_.init();
   }
 
+  /**
+   * Initialize the Proxies without Cast sender.
+   * @private
+   */
+  initWithoutSender_() {
+    this.videoProxy_ = /** @type {Object} */(this.localVideo_);
+    this.playerProxy_ = /** @type {Object} */(this.localPlayer_);
+  }
+
   /**
    * Initialize the Proxies and the Cast sender.
    * @private

package/lib/debug/log.js

@@ -135,15 +135,14 @@ shaka.log.oneTimeWarningIssued_ = new Set();
 
 
 if (window.console) {
-  /** @private {!Object<shaka.log.Level, function(...*)>} */
-  shaka.log.logMap_ = {
-    [shaka.log.Level.ERROR]: (...args) => console.error(...args),
-    [shaka.log.Level.WARNING]: (...args) => console.warn(...args),
-    [shaka.log.Level.INFO]: (...args) => console.info(...args),
-    [shaka.log.Level.DEBUG]: (...args) => console.log(...args),
-    [shaka.log.Level.V1]: (...args) => console.debug(...args),
-    [shaka.log.Level.V2]: (...args) => console.debug(...args),
-  };
+  /** @private {!Map<shaka.log.Level, function(...*)>} */
+  shaka.log.logMap_ = new Map()
+      .set(shaka.log.Level.ERROR, (...args) => console.error(...args))
+      .set(shaka.log.Level.WARNING, (...args) => console.warn(...args))
+      .set(shaka.log.Level.INFO, (...args) => console.info(...args))
+      .set(shaka.log.Level.DEBUG, (...args) => console.log(...args))
+      .set(shaka.log.Level.V1, (...args) => console.debug(...args))
+      .set(shaka.log.Level.V2, (...args) => console.debug(...args));
 
   shaka.log.alwaysWarn = (...args) => console.warn(...args);
   shaka.log.alwaysError = (...args) => console.error(...args);
@@ -168,8 +167,8 @@ if (window.console) {
       const getLog = (curLevel) => {
         if (curLevel <= level) {
           goog.asserts.assert(
-              shaka.log.logMap_[curLevel], 'Unexpected log level');
-          return shaka.log.logMap_[curLevel];
+              shaka.log.logMap_.has(curLevel), 'Unexpected log level');
+          return shaka.log.logMap_.get(curLevel);
         } else {
           return () => {};
         }
@@ -187,22 +186,22 @@ if (window.console) {
     shaka.log.setLevel(shaka.log.MAX_LOG_LEVEL);
   } else {
     if (shaka.log.MAX_LOG_LEVEL >= shaka.log.Level.ERROR) {
-      shaka.log.error = shaka.log.logMap_[shaka.log.Level.ERROR];
+      shaka.log.error = shaka.log.logMap_.get(shaka.log.Level.ERROR);
     }
     if (shaka.log.MAX_LOG_LEVEL >= shaka.log.Level.WARNING) {
-      shaka.log.warning = shaka.log.logMap_[shaka.log.Level.WARNING];
+      shaka.log.warning = shaka.log.logMap_.get(shaka.log.Level.WARNING);
     }
     if (shaka.log.MAX_LOG_LEVEL >= shaka.log.Level.INFO) {
-      shaka.log.info = shaka.log.logMap_[shaka.log.Level.INFO];
+      shaka.log.info = shaka.log.logMap_.get(shaka.log.Level.INFO);
     }
     if (shaka.log.MAX_LOG_LEVEL >= shaka.log.Level.DEBUG) {
-      shaka.log.debug = shaka.log.logMap_[shaka.log.Level.DEBUG];
+      shaka.log.debug = shaka.log.logMap_.get(shaka.log.Level.DEBUG);
     }
     if (shaka.log.MAX_LOG_LEVEL >= shaka.log.Level.V1) {
-      shaka.log.v1 = shaka.log.logMap_[shaka.log.Level.V1];
+      shaka.log.v1 = shaka.log.logMap_.get(shaka.log.Level.V1);
     }
     if (shaka.log.MAX_LOG_LEVEL >= shaka.log.Level.V2) {
-      shaka.log.v2 = shaka.log.logMap_[shaka.log.Level.V2];
+      shaka.log.v2 = shaka.log.logMap_.get(shaka.log.Level.V2);
     }
   }
 }

package/lib/hls/hls_parser.js

@@ -988,6 +988,31 @@ shaka.hls.HlsParser = class {
               new shaka.hls.Tag(tag.id, tag.name, newAttributes, null));
         }
         variantTags.push(...newVariantTags);
+
+        // Duplicate iFrame tags with supplementalCodecs
+        const newIFrameTags = [];
+        for (const tag of iFrameTags) {
+          const supplementalCodecsString =
+              tag.getAttributeValue('SUPPLEMENTAL-CODECS');
+          if (!supplementalCodecsString) {
+            continue;
+          }
+          const supplementalCodecs = supplementalCodecsString.split(/\s*,\s*/)
+              .map((codec) => {
+                return codec.split('/')[0];
+              });
+          const newAttributes = tag.attributes.map((attr) => {
+            const name = attr.name;
+            let value = attr.value;
+            if (name == 'CODECS') {
+              value = supplementalCodecs.join(',');
+            }
+            return new shaka.hls.Attribute(name, value);
+          });
+          newIFrameTags.push(
+              new shaka.hls.Tag(tag.id, tag.name, newAttributes, null));
+        }
+        iFrameTags.push(...newIFrameTags);
       }
 
       this.parseCodecs_(variantTags);
@@ -2386,12 +2411,13 @@ shaka.hls.HlsParser = class {
       return this.uriToStreamInfosMap_.get(key);
     }
 
+    const name = verbatimMediaPlaylistUris.join(',');
     const closedCaptions = this.getClosedCaptions_(tags[0], type);
     const codecs = shaka.util.ManifestParserUtils.guessCodecs(type, allCodecs);
     const streamInfo = this.createStreamInfo_(
         streamId, verbatimMediaPlaylistUris,
         codecs, type, /* language= */ null, /* primary= */ false,
-        /* name= */ null, /* channelCount= */ null, closedCaptions,
+        name, /* channelCount= */ null, closedCaptions,
         /* characteristics= */ null, /* forced= */ false,
         /* sampleRate= */ null, /* spatialAudio= */ false);