shaka-player 3.3.18 → 3.3.19

package/docs/tutorials/fairplay.md

@@ -25,14 +25,14 @@ is used by the browser to generate the license request.  If you don't use the
 default content ID derivation, you need to specify a custom init data transform:
 
 ```js
-player.configure('drm.initDataTransform', (initData, initDataType) => {
+player.configure('drm.initDataTransform', (initData, initDataType, drmInfo) => {
   if (initDataType != 'skd')
     return initData;
 
   // 'initData' is a buffer containing an 'skd://' URL as a UTF-8 string.
   const skdUri = shaka.util.StringUtils.fromBytesAutoDetect(initData);
   const contentId = getMyContentId(skdUri);
-  const cert = player.drmInfo().serverCertificate;
+  const cert = drmInfo.serverCertificate;
   return shaka.util.FairPlayUtils.initDataTransform(initData, contentId, cert);
 });
 ```

package/externs/shaka/net.js

@@ -100,6 +100,7 @@ shaka.extern.Request;
 /**
  * @typedef {{
  *   uri: string,
+ *   originalUri: string,
  *   data: BufferSource,
  *   status: (number|undefined),
  *   headers: !Object.<string, string>,

package/externs/shaka/player.js

@@ -613,9 +613,7 @@ shaka.extern.AdvancedDrmConfiguration;
  *   clearKeys: !Object.<string, string>,
  *   delayLicenseRequestUntilPlayed: boolean,
  *   advanced: Object.<string, shaka.extern.AdvancedDrmConfiguration>,
- *   initDataTransform:
- *       ((function(!Uint8Array, string, ?shaka.extern.DrmInfo):!Uint8Array)|
- *         undefined),
+ *   initDataTransform:(shaka.extern.InitDataTransform|undefined),
  *   logLicenseExchange: boolean,
  *   updateExpirationTime: number,
  *   preferredKeySystems: !Array.<string>
@@ -639,10 +637,7 @@ shaka.extern.AdvancedDrmConfiguration;
  *   <i>Optional.</i> <br>
  *   A dictionary which maps key system IDs to advanced DRM configuration for
  *   those key systems.
- * @property
- *     {((function(!Uint8Array, string, ?shaka.extern.DrmInfo):!Uint8Array)|
- *        undefined)}
- *   initDataTransform
+ * @property {shaka.extern.InitDataTransform|undefined} initDataTransform
  *   <i>Optional.</i><br>
  *   If given, this function is called with the init data from the
  *   manifest/media and should return the (possibly transformed) init data to
@@ -664,6 +659,17 @@ shaka.extern.AdvancedDrmConfiguration;
  */
 shaka.extern.DrmConfiguration;
 
+/**
+ * @typedef {function(!Uint8Array, string, ?shaka.extern.DrmInfo):!Uint8Array}
+ *
+ * @description
+ * A callback function to handle custom content ID signaling for FairPlay
+ * content.
+ *
+ * @exportDoc
+ */
+shaka.extern.InitDataTransform;
+
 
 /**
  * @typedef {{

package/lib/ads/client_side_ad_manager.js

@@ -212,9 +212,9 @@ shaka.ads.ClientSideAdManager = class {
       // seen the ads actually play until requestAds() is called.
       // Note: We listen for a play event to avoid autoplay issues that might
       // crash IMA.
-      this.video_.addEventListener('play', () => {
+      this.eventManager_.listenOnce(this.video_, 'play', () => {
         this.imaAdsManager_.start();
-      }, {once: true});
+      });
     } catch (adError) {
       // If there was a problem with the VAST response,
       // we we won't be getting an ad. Hide ad UI if we showed it already
@@ -402,7 +402,10 @@ shaka.ads.ClientSideAdManager = class {
     if (this.ad_.isLinear()) {
       this.adContainer_.setAttribute('ad-active', 'true');
       this.video_.pause();
-      this.ad_.setVolume(this.video_.muted ? 0 : this.video_.volume);
+      this.ad_.setVolume(this.video_.volume);
+      if (this.video_.muted) {
+        this.ad_.setMuted(true);
+      }
     }
   }
 

package/lib/dash/dash_parser.js

@@ -1278,55 +1278,56 @@ shaka.dash.DashParser = class {
         context.period.id + ',' + context.representation.id : '';
 
     /** @type {shaka.extern.Stream} */
-    const stream = {
-      id: this.globalId_++,
-      originalId: context.representation.id,
-      createSegmentIndex: async () => {
-        // If we have a stream with the same context id stored in the map
-        // that has no segmentIndex, we should set the segmentIndex for it.
-        const storedInMap = contextId && context.dynamic &&
-              this.streamMap_[contextId];
-
-        const currentStream = storedInMap ? this.streamMap_[contextId] : stream;
-        if (!currentStream.segmentIndex) {
-          currentStream.segmentIndex = await streamInfo.generateSegmentIndex();
-        }
-      },
+    let stream;
 
-      closeSegmentIndex: () => {
-        if (stream.segmentIndex) {
-          stream.segmentIndex.release();
-          stream.segmentIndex = null;
-        }
-      },
-      segmentIndex: null,
-      mimeType: context.representation.mimeType,
-      codecs: context.representation.codecs,
-      frameRate: context.representation.frameRate,
-      pixelAspectRatio: context.representation.pixelAspectRatio,
-      bandwidth: context.bandwidth,
-      width: context.representation.width,
-      height: context.representation.height,
-      kind,
-      encrypted: contentProtection.drmInfos.length > 0,
-      drmInfos: contentProtection.drmInfos,
-      keyIds,
-      language,
-      label,
-      type: context.adaptationSet.contentType,
-      primary: isPrimary,
-      trickModeVideo: null,
-      emsgSchemeIdUris:
-          context.representation.emsgSchemeIdUris,
-      roles,
-      forced: forced,
-      channelsCount: context.representation.numChannels,
-      audioSamplingRate: context.representation.audioSamplingRate,
-      spatialAudio: spatialAudio,
-      closedCaptions,
-      hdr,
-      tilesLayout,
-      matchedStreams: [],
+    if (contextId && this.streamMap_[contextId]) {
+      stream = this.streamMap_[contextId];
+    } else {
+      stream = {
+        id: this.globalId_++,
+        originalId: context.representation.id,
+        createSegmentIndex: () => Promise.resolve(),
+        closeSegmentIndex: () => {
+          if (stream.segmentIndex) {
+            stream.segmentIndex.release();
+            stream.segmentIndex = null;
+          }
+        },
+        segmentIndex: null,
+        mimeType: context.representation.mimeType,
+        codecs: context.representation.codecs,
+        frameRate: context.representation.frameRate,
+        pixelAspectRatio: context.representation.pixelAspectRatio,
+        bandwidth: context.bandwidth,
+        width: context.representation.width,
+        height: context.representation.height,
+        kind,
+        encrypted: contentProtection.drmInfos.length > 0,
+        drmInfos: contentProtection.drmInfos,
+        keyIds,
+        language,
+        label,
+        type: context.adaptationSet.contentType,
+        primary: isPrimary,
+        trickModeVideo: null,
+        emsgSchemeIdUris:
+            context.representation.emsgSchemeIdUris,
+        roles,
+        forced,
+        channelsCount: context.representation.numChannels,
+        audioSamplingRate: context.representation.audioSamplingRate,
+        spatialAudio,
+        closedCaptions,
+        hdr,
+        tilesLayout,
+        matchedStreams: [],
+      };
+    }
+
+    stream.createSegmentIndex = async () => {
+      if (!stream.segmentIndex) {
+        stream.segmentIndex = await streamInfo.generateSegmentIndex();
+      }
     };
 
     if (contextId && context.dynamic && !this.streamMap_[contextId]) {

package/lib/media/media_source_engine.js

@@ -182,6 +182,9 @@ shaka.media.MediaSourceEngine = class {
       'audio/mp4; codecs="ec-3"',
       'audio/mp4; codecs="opus"',
       'audio/mp4; codecs="flac"',
+      'audio/mp4; codecs="dtsc"', // DTS Digital Surround
+      'audio/mp4; codecs="dtse"', // DTS Express
+      'audio/mp4; codecs="dtsx"', // DTS:X
       // WebM types
       'video/webm; codecs="vp8"',
       'video/webm; codecs="vp9"',
@@ -515,7 +518,7 @@ shaka.media.MediaSourceEngine = class {
       // For HLS CEA-608/708 CLOSED-CAPTIONS, text data is embedded in
       // the video stream, so textEngine may not have been initialized.
       if (!this.textEngine_) {
-        this.reinitText('text/vtt');
+        this.reinitText(shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE);
       }
 
       if (transmuxedData.metadata) {
@@ -542,7 +545,7 @@ shaka.media.MediaSourceEngine = class {
           contentType, () => this.append_(contentType, transmuxedSegment));
     } else if (hasClosedCaptions) {
       if (!this.textEngine_) {
-        this.reinitText('text/vtt');
+        this.reinitText(shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE);
       }
       // If it is the init segment for closed captions, initialize the closed
       // caption parser.
@@ -711,8 +714,10 @@ shaka.media.MediaSourceEngine = class {
   async endOfStream(reason) {
     await this.enqueueBlockingOperation_(() => {
       // If endOfStream() has already been called on the media source,
-      // don't call it again.
-      if (this.ended()) {
+      // don't call it again. Also do not call if readyState is
+      // 'closed' (not attached to video element) since it is not a
+      // valid operation.
+      if (this.ended() || this.mediaSource_.readyState === 'closed') {
         return;
       }
       // Tizen won't let us pass undefined, but it will let us omit the

package/lib/media/streaming_engine.js

@@ -77,6 +77,9 @@ shaka.media.StreamingEngine = class {
     /** @private {?shaka.extern.Stream} */
     this.currentTextStream_ = null;
 
+    /** @private {number} */
+    this.textStreamSequenceId_ = 0;
+
     /**
      * Maps a content type, e.g., 'audio', 'video', or 'text', to a MediaState.
      *
@@ -220,6 +223,8 @@ shaka.media.StreamingEngine = class {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
     goog.asserts.assert(!this.mediaStates_.has(ContentType.TEXT),
         'Should not call loadNewTextStream_ while streaming text!');
+    this.textStreamSequenceId_++;
+    const currentSequenceId = this.textStreamSequenceId_;
 
     try {
       // Clear MediaSource's buffered text, so that the new text stream will
@@ -241,7 +246,7 @@ shaka.media.StreamingEngine = class {
     const streamText =
         textDisplayer.isTextVisible() || this.config_.alwaysStreamText;
 
-    if (streamText) {
+    if (streamText && (this.textStreamSequenceId_ == currentSequenceId)) {
       const state = this.createMediaState_(stream);
       this.mediaStates_.set(ContentType.TEXT, state);
       this.scheduleUpdate_(state, 0);
@@ -1488,10 +1493,10 @@ shaka.media.StreamingEngine = class {
           'waiting for another stream to recover...');
     }
 
-    // QuotaExceededError gets thrown if evication didn't help to make room
+    // QuotaExceededError gets thrown if eviction didn't help to make room
     // for a segment. We want to wait for a while (4 seconds is just an
     // arbitrary number) before updating to give the playhead a chance to
-    // advance, so we don't immidiately throw again.
+    // advance, so we don't immediately throw again.
     this.scheduleUpdate_(mediaState, 4);
   }
 

package/lib/net/http_fetch_plugin.js

@@ -120,65 +120,77 @@ shaka.net.HttpFetchPlugin = class {
       // not the body yet.
       headersReceived(shaka.net.HttpFetchPlugin.headersToGenericObject_(
           response.headers));
-      // Getting the reader in this way allows us to observe the process of
-      // downloading the body, instead of just waiting for an opaque promise to
-      // resolve.
-      // We first clone the response because calling getReader locks the body
-      // stream; if we didn't clone it here, we would be unable to get the
-      // response's arrayBuffer later.
-      const reader = response.clone().body.getReader();
-
-      const contentLengthRaw = response.headers.get('Content-Length');
-      const contentLength =
-          contentLengthRaw ? parseInt(contentLengthRaw, 10) : 0;
-
-      const start = (controller) => {
-        const push = async () => {
-          let readObj;
-          try {
-            readObj = await reader.read();
-          } catch (e) {
-            // If we abort the request, we'll get an error here.  Just ignore it
-            // since real errors will be reported when we read the buffer below.
-            shaka.log.v1('error reading from stream', e.message);
-            return;
-          }
-
-          if (!readObj.done) {
-            loaded += readObj.value.byteLength;
-            if (streamDataCallback) {
-              await streamDataCallback(readObj.value);
+
+      // In new versions of Chromium, HEAD requests now have a response body
+      // that is null.
+      // So just don't try to download the body at all, if it's a HEAD request,
+      // to avoid null reference errors.
+      // See: https://crbug.com/1297060
+      if (init.method != 'HEAD') {
+        goog.asserts.assert(response.body,
+            'non-HEAD responses should have a body');
+
+        // Getting the reader in this way allows us to observe the process of
+        // downloading the body, instead of just waiting for an opaque promise
+        // to resolve.
+        // We first clone the response because calling getReader locks the body
+        // stream; if we didn't clone it here, we would be unable to get the
+        // response's arrayBuffer later.
+        const reader = response.clone().body.getReader();
+
+        const contentLengthRaw = response.headers.get('Content-Length');
+        const contentLength =
+            contentLengthRaw ? parseInt(contentLengthRaw, 10) : 0;
+
+        const start = (controller) => {
+          const push = async () => {
+            let readObj;
+            try {
+              readObj = await reader.read();
+            } catch (e) {
+              // If we abort the request, we'll get an error here.  Just ignore
+              // it since real errors will be reported when we read the buffer
+              // below.
+              shaka.log.v1('error reading from stream', e.message);
+              return;
+            }
+
+            if (!readObj.done) {
+              loaded += readObj.value.byteLength;
+              if (streamDataCallback) {
+                await streamDataCallback(readObj.value);
+              }
+            }
+
+            const currentTime = Date.now();
+            // If the time between last time and this time we got progress event
+            // is long enough, or if a whole segment is downloaded, call
+            // progressUpdated().
+            if (currentTime - lastTime > 100 || readObj.done) {
+              progressUpdated(currentTime - lastTime, loaded - lastLoaded,
+                  contentLength - loaded);
+              lastLoaded = loaded;
+              lastTime = currentTime;
+            }
+
+            if (readObj.done) {
+              goog.asserts.assert(!readObj.value,
+                  'readObj should be unset when "done" is true.');
+              controller.close();
+            } else {
+              controller.enqueue(readObj.value);
+              push();
             }
-          }
-
-          const currentTime = Date.now();
-          // If the time between last time and this time we got progress event
-          // is long enough, or if a whole segment is downloaded, call
-          // progressUpdated().
-          if (currentTime - lastTime > 100 || readObj.done) {
-            progressUpdated(currentTime - lastTime, loaded - lastLoaded,
-                contentLength - loaded);
-            lastLoaded = loaded;
-            lastTime = currentTime;
-          }
-
-          if (readObj.done) {
-            goog.asserts.assert(!readObj.value,
-                'readObj should be unset when "done" is true.');
-            controller.close();
-          } else {
-            controller.enqueue(readObj.value);
-            push();
-          }
+          };
+          push();
         };
-        push();
-      };
-      // Create a ReadableStream to use the reader. We don't need to use the
-      // actual stream for anything, though, as we are using the response's
-      // arrayBuffer method to get the body, so we don't store the
-      // ReadableStream.
-      new ReadableStream({start}); // eslint-disable-line no-new
-      arrayBuffer = await response.arrayBuffer();
+        // Create a ReadableStream to use the reader. We don't need to use the
+        // actual stream for anything, though, as we are using the response's
+        // arrayBuffer method to get the body, so we don't store the
+        // ReadableStream.
+        new ReadableStream({start}); // eslint-disable-line no-new
+        arrayBuffer = await response.arrayBuffer();
+      }
     } catch (error) {
       if (abortStatus.canceled) {
         throw new shaka.util.Error(
@@ -243,6 +255,16 @@ shaka.net.HttpFetchPlugin = class {
     } else {
       return false;
     }
+    // Old fetch implementations hasn't body and ReadableStream implementation
+    // See: https://github.com/shaka-project/shaka-player/issues/5088
+    if (window.Response) {
+      const response = new Response('');
+      if (!response.body) {
+        return false;
+      }
+    } else {
+      return false;
+    }
     return !!(window.fetch && window.AbortController);
   }
 };

package/lib/net/networking_engine.js

@@ -309,6 +309,7 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
       if (!responseAndGotProgress.gotProgress &&
           this.onProgressUpdated_ &&
           !response.fromCache &&
+          request.method != 'HEAD' &&
           type == shaka.net.NetworkingEngine.RequestType.SEGMENT) {
         this.onProgressUpdated_(response.timeMs, response.data.byteLength);
       }

package/lib/player.js

@@ -1225,6 +1225,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    */
   shouldUseSrcEquals_(payload) {
     const Platform = shaka.util.Platform;
+    const MimeUtils = shaka.util.MimeUtils;
 
     // If we are using a platform that does not support media source, we will
     // fall back to src= to handle all playback.
@@ -1279,7 +1280,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // version there.
 
       // Native HLS can be preferred on any platform via this flag:
-      if (this.config_.streaming.preferNativeHls) {
+      if (MimeUtils.isHlsType(mimeType) &&
+          this.config_.streaming.preferNativeHls) {
         return true;
       }
 
@@ -4062,6 +4064,19 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
               firstVariantWithLabel.language, '', 0, label);
 
       this.chooseVariantAndSwitch_();
+    } else if (this.video_ && this.video_.audioTracks) {
+      const audioTracks = Array.from(this.video_.audioTracks);
+
+      let trackMatch = null;
+
+      for (const audioTrack of audioTracks) {
+        if (audioTrack.label == label) {
+          trackMatch = audioTrack;
+        }
+      }
+      if (trackMatch) {
+        this.switchHtml5Track_(trackMatch);
+      }
     }
   }
 
@@ -6665,7 +6680,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v3.3.18-uncompiled';
+shaka.Player.version = 'v3.3.19-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/media_capabilities.js

@@ -101,6 +101,19 @@ shaka.polyfill.MediaCapabilities = class {
         if (shaka.util.Platform.isChromecast()) {
           isSupported =
               shaka.polyfill.MediaCapabilities.canCastDisplayType_(videoConfig);
+        } else if (shaka.util.Platform.isTizen()) {
+          let extendedType = videoConfig.contentType;
+          if (videoConfig.width && videoConfig.height) {
+            extendedType += `; width=${videoConfig.width}`;
+            extendedType += `; height=${videoConfig.height}`;
+          }
+          if (videoConfig.framerate) {
+            extendedType += `; framerate=${videoConfig.framerate}`;
+          }
+          if (videoConfig.bitrate) {
+            extendedType += `; bitrate=${videoConfig.bitrate}`;
+          }
+          isSupported = MediaSource.isTypeSupported(extendedType);
         } else {
           isSupported = MediaSource.isTypeSupported(videoConfig.contentType);
         }

package/lib/text/mp4_vtt_parser.js

@@ -89,6 +89,10 @@ shaka.text.Mp4VttParser = class {
    * @export
    */
   parseMedia(data, time) {
+    if (!data.length) {
+      return [];
+    }
+
     if (!this.timescale_) {
       // Missing timescale for VTT content. We should have seen the init
       // segment.

package/lib/text/text_engine.js

@@ -134,6 +134,7 @@ shaka.text.TextEngine = class {
     // into TextEngine and TextDisplayer.
     if (mimeType == shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE ||
         mimeType == shaka.util.MimeUtils.CEA708_CLOSED_CAPTION_MIMETYPE) {
+      this.parser_ = null;
       return;
     }
 

package/lib/util/manifest_parser_utils.js

@@ -185,8 +185,7 @@ shaka.util.ManifestParserUtils.AUDIO_CODEC_REGEXPS_ = [
   /^mp4a/,
   /^[ae]c-3$/,
   /^ac-4$/,
-  /^dts[cx]$/, // DTS Surround Sound
-  /^[du]dts$/, // DTS Surround Sound
+  /^dts[cex]$/, // DTS Digital Surround (dtsc), DTS Express (dtse), DTS:X (dtsx)
 ];
 
 

package/lib/util/mime_utils.js

@@ -194,6 +194,17 @@ shaka.util.MimeUtils = class {
     return value;
   }
 
+  /**
+   * Checks if the given MIME type is HLS MIME type.
+   *
+   * @param {string} mimeType
+   * @return {boolean}
+   */
+  static isHlsType(mimeType) {
+    return mimeType === 'application/x-mpegurl' ||
+        mimeType === 'application/vnd.apple.mpegurl';
+  }
+
   /**
    * Get the base and profile of a codec string. Where [0] will be the codec
    * base and [1] will be the profile.

package/lib/util/periods.js

@@ -671,11 +671,11 @@ shaka.util.PeriodCombiner = class {
     // Also checks if the segmentIndex is still valid after the async
     // operations, to make sure we stop if the active stream has changed.
     if (outputStream.segmentIndex instanceof shaka.media.MetaSegmentIndex) {
-      for (let i = 0; i < streams.length; i++) {
+      for (let i = firstNewPeriodIndex; i < streams.length; i++) {
         const match = streams[i];
-        if (match.segmentIndex && i >= firstNewPeriodIndex) {
-          goog.asserts.assert(match.segmentIndex,
-              'stream should have a segmentIndex.');
+        goog.asserts.assert(match.segmentIndex,
+            'stream should have a segmentIndex.');
+        if (match.segmentIndex) {
           outputStream.segmentIndex.appendSegmentIndex(match.segmentIndex);
         }
       }
@@ -728,7 +728,7 @@ shaka.util.PeriodCombiner = class {
       // in advance.  concat() will add them to the output's MetaSegmentIndex.
     }
 
-    if (!outputStream.matchedStreams) {
+    if (!outputStream.matchedStreams || !outputStream.matchedStreams.length) {
       // This is not a stream we can build output from, but it may become part
       // of another output based on another period's stream.
       return null;

package/lib/util/stream_utils.js

@@ -821,7 +821,7 @@ shaka.util.StreamUtils = class {
       const video = variant.video;
       if (audio && currentVariant && currentVariant.audio) {
         if (!StreamUtils.areStreamsCompatible_(audio, currentVariant.audio)) {
-          shaka.log.debug('Droping variant - not compatible with active audio',
+          shaka.log.debug('Dropping variant - not compatible with active audio',
               'active audio',
               StreamUtils.getStreamSummaryString_(currentVariant.audio),
               'variant.audio',
@@ -832,7 +832,7 @@ shaka.util.StreamUtils = class {
 
       if (video && currentVariant && currentVariant.video) {
         if (!StreamUtils.areStreamsCompatible_(video, currentVariant.video)) {
-          shaka.log.debug('Droping variant - not compatible with active video',
+          shaka.log.debug('Dropping variant - not compatible with active video',
               'active video',
               StreamUtils.getStreamSummaryString_(currentVariant.video),
               'variant.video',

package/maintained-branches.md

@@ -2,10 +2,9 @@
 
 We are currently maintaining the following branches of Shaka Player:
 
- - v4.2 (latest)
- - v4.1 (previous)
- - v3.3 (LTS until April 30, 2023)
- - v3.2 (in use by the Cast Application Framework)
+ - v4.3 (latest, also in use by the Cast Application Framework)
+ - v4.2 (previous)
+ - No active LTS branches at this time
 
 Other branches are no longer receiving bug fixes, and we recommend you upgrade
 to a maintained branch.  For details on upgrading, please see our

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "3.3.18",
+  "version": "3.3.19",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [