shaka-player 4.5.0 → 4.6.0

package/lib/polyfill/mediasource.js

@@ -40,7 +40,18 @@ shaka.polyfill.MediaSource = class {
     } else if (safariVersion) {
       // NOTE:  shaka.Player.isBrowserSupported() has its own restrictions on
       // Safari version.
-      if (safariVersion <= 12) {
+      if (safariVersion <= 10) {
+        // Safari 8 does not implement appendWindowEnd.
+        // Safari 9 & 10 do not correctly implement abort() on SourceBuffer.
+        // Bug filed: https://bugs.webkit.org/show_bug.cgi?id=160316
+        // Blacklist these very outdated versions.
+        // Bug filed: https://bugs.webkit.org/show_bug.cgi?id=165342
+        // Safari 10 fires spurious 'updateend' events after endOfStream().
+        // Bug filed: https://bugs.webkit.org/show_bug.cgi?id=165336
+
+        shaka.log.info('Blacklisting MSE on Safari <= 10.');
+        shaka.polyfill.MediaSource.blacklist_();
+      } else if (safariVersion <= 12) {
         shaka.log.info('Patching Safari 11 & 12 MSE bugs.');
         // Safari 11 & 12 do not correctly implement abort() on SourceBuffer.
         // Calling abort() before appending a segment causes that segment to be
@@ -89,6 +100,16 @@ shaka.polyfill.MediaSource = class {
     }
   }
 
+  /**
+   * Blacklist the current browser by making
+   * MediaSourceEngine.isBrowserSupported fail later.
+   *
+   * @private
+   */
+  static blacklist_() {
+    window['MediaSource'] = null;
+  }
+
   /**
    * Stub out abort().  On some buggy MSE implementations, calling abort()
    * causes various problems.

package/lib/text/mp4_ttml_parser.js

@@ -75,7 +75,7 @@ shaka.text.Mp4TtmlParser = class {
    * @override
    * @export
    */
-  parseMedia(data, time) {
+  parseMedia(data, time, uri) {
     const Mp4Parser = shaka.util.Mp4Parser;
 
     let sawMDAT = false;
@@ -86,7 +86,7 @@ shaka.text.Mp4TtmlParser = class {
           sawMDAT = true;
           // Join this to any previous payload, in case the mp4 has multiple
           // mdats.
-          payload = payload.concat(this.parser_.parseMedia(data, time));
+          payload = payload.concat(this.parser_.parseMedia(data, time, uri));
         }));
     parser.parse(data, /* partialOkay= */ false);
 

package/lib/text/srt_text_parser.js

@@ -55,7 +55,7 @@ shaka.text.SrtTextParser = class {
    * @override
    * @export
    */
-  parseMedia(data, time) {
+  parseMedia(data, time, uri) {
     const SrtTextParser = shaka.text.SrtTextParser;
     const BufferUtils = shaka.util.BufferUtils;
     const StringUtils = shaka.util.StringUtils;
@@ -67,7 +67,7 @@ shaka.text.SrtTextParser = class {
 
     const newData = BufferUtils.toUint8(StringUtils.toUTF8(vvtText));
 
-    return this.parser_.parseMedia(newData, time);
+    return this.parser_.parseMedia(newData, time, uri);
   }
 
   /**

package/lib/text/stub_text_displayer.js

@@ -0,0 +1,51 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2023 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.provide('shaka.text.StubTextDisplayer');
+
+/**
+* A stub text displayer plugin that does nothing
+*
+* @implements {shaka.extern.TextDisplayer}
+* @export
+*/
+shaka.text.StubTextDisplayer = class {
+  /**
+   * @override
+   * @export
+   */
+  remove(start, end) {
+  }
+
+  /**
+   * @override
+   * @export
+   */
+  append(cues) {
+  }
+
+  /**
+   * @override
+   * @export
+   */
+  destroy() {
+  }
+
+  /**
+   * @override
+   * @export
+   */
+  isTextVisible() {
+    return false;
+  }
+
+  /**
+   * @override
+   * @export
+   */
+  setTextVisibility(on) {
+  }
+};

package/lib/text/text_engine.js

@@ -166,9 +166,10 @@ shaka.text.TextEngine = class {
    * @param {BufferSource} buffer
    * @param {?number} startTime relative to the start of the presentation
    * @param {?number} endTime relative to the start of the presentation
+   * @param {?string=} uri
    * @return {!Promise}
    */
-  async appendBuffer(buffer, startTime, endTime) {
+  async appendBuffer(buffer, startTime, endTime, uri) {
     goog.asserts.assert(
         this.parser_, 'The parser should already be initialized');
 
@@ -198,7 +199,7 @@ shaka.text.TextEngine = class {
 
     // Parse the buffer and add the new cues.
     const allCues = this.parser_.parseMedia(
-        shaka.util.BufferUtils.toUint8(buffer), time);
+        shaka.util.BufferUtils.toUint8(buffer), time, uri);
     const cuesToAppend = allCues.filter((cue) => {
       return cue.startTime >= this.appendWindowStart_ &&
           cue.startTime < this.appendWindowEnd_;

package/lib/text/ttml_text_parser.js

@@ -7,6 +7,7 @@
 goog.provide('shaka.text.TtmlTextParser');
 
 goog.require('goog.asserts');
+goog.require('goog.Uri');
 goog.require('shaka.log');
 goog.require('shaka.text.Cue');
 goog.require('shaka.text.CueRegion');
@@ -50,7 +51,7 @@ shaka.text.TtmlTextParser = class {
    * @override
    * @export
    */
-  parseMedia(data, time) {
+  parseMedia(data, time, uri) {
     const TtmlTextParser = shaka.text.TtmlTextParser;
     const XmlUtils = shaka.util.XmlUtils;
     const ttpNs = TtmlTextParser.parameterNs_;
@@ -147,7 +148,7 @@ shaka.text.TtmlTextParser = class {
         body, time, rateInfo, metadataElements, styles,
         regionElements, cueRegions, whitespaceTrim,
         cellResolutionInfo, /* parentCueElement= */ null,
-        /* isContent= */ false);
+        /* isContent= */ false, uri);
     if (cue) {
       // According to the TTML spec, backgrounds default to transparent.
       // So default the background of the top-level element to transparent.
@@ -175,12 +176,14 @@ shaka.text.TtmlTextParser = class {
    * @param {?{columns: number, rows: number}} cellResolution
    * @param {?Element} parentCueElement
    * @param {boolean} isContent
+   * @param {?(string|undefined)} uri
    * @return {shaka.text.Cue}
    * @private
    */
   static parseCue_(
       cueNode, timeContext, rateInfo, metadataElements, styles, regionElements,
-      cueRegions, whitespaceTrim, cellResolution, parentCueElement, isContent) {
+      cueRegions, whitespaceTrim, cellResolution, parentCueElement, isContent,
+      uri) {
     /** @type {Element} */
     let cueElement;
     /** @type {Element} */
@@ -222,7 +225,21 @@ shaka.text.TtmlTextParser = class {
       }
     }
 
-    if (cueNode.nodeName == 'p' || imageElement) {
+    let imageUri = null;
+    const backgroundImage = shaka.util.XmlUtils.getAttributeNSList(
+        cueElement,
+        shaka.text.TtmlTextParser.smpteNsList_,
+        'backgroundImage');
+    if (uri && backgroundImage && !backgroundImage.startsWith('#')) {
+      const baseUri = new goog.Uri(uri);
+      const relativeUri = new goog.Uri(backgroundImage);
+      const newUri = baseUri.resolve(relativeUri).toString();
+      if (newUri) {
+        imageUri = newUri;
+      }
+    }
+
+    if (cueNode.nodeName == 'p' || imageElement || imageUri) {
       isContent = true;
     }
 
@@ -255,6 +272,7 @@ shaka.text.TtmlTextParser = class {
             cellResolution,
             cueElement,
             isContent,
+            uri,
         );
 
         // This node may or may not generate a nested cue.
@@ -388,6 +406,7 @@ shaka.text.TtmlTextParser = class {
         cueElement,
         regionElementForStyle,
         imageElement,
+        imageUri,
         styles,
         /** isNested= */ parentIsContent, // "nested in a <div>" doesn't count.
         /** isLeaf= */ (nestedCues.length == 0));
@@ -490,13 +509,15 @@ shaka.text.TtmlTextParser = class {
    * @param {!Element} cueElement
    * @param {Element} region
    * @param {Element} imageElement
+   * @param {?string} imageUri
    * @param {!Array.<!Element>} styles
    * @param {boolean} isNested
    * @param {boolean} isLeaf
    * @private
    */
   static addStyle_(
-      cue, cueElement, region, imageElement, styles, isNested, isLeaf) {
+      cue, cueElement, region, imageElement, imageUri, styles,
+      isNested, isLeaf) {
     const TtmlTextParser = shaka.text.TtmlTextParser;
     const Cue = shaka.text.Cue;
 
@@ -664,6 +685,8 @@ shaka.text.TtmlTextParser = class {
           backgroundImageData) {
         cue.backgroundImage = 'data:image/png;base64,' + backgroundImageData;
       }
+    } else if (imageUri) {
+      cue.backgroundImage = imageUri;
     }
 
     const textOutline = TtmlTextParser.getStyleAttribute_(

package/lib/text/ui_text_displayer.js

@@ -604,6 +604,10 @@ shaka.text.UITextDisplayer = class {
           // Only do this for the text itself.
           elem.style.backgroundColor = 'rgba(0, 0, 0, 0.8)';
         }
+        const fontFamily = inherit((c) => c.fontFamily);
+        if (fontFamily) {
+          elem.style.fontFamily = fontFamily;
+        }
       }
       if (text) {
         elem.textContent = text;

package/lib/text/vtt_text_parser.js

@@ -421,8 +421,6 @@ shaka.text.VttTextParser = class {
       cue = new shaka.text.Cue(start, end, '');
     }
 
-    VttTextParser.parseCueStyles(payload, cue, styles);
-
     // Parse optional settings.
     parser.skipWhitespace();
     let word = parser.readWord();
@@ -436,6 +434,8 @@ shaka.text.VttTextParser = class {
       word = parser.readWord();
     }
 
+    VttTextParser.parseCueStyles(payload, cue, styles);
+
     if (id != null) {
       cue.id = id;
     }
@@ -707,6 +707,11 @@ shaka.text.VttTextParser = class {
     nestedCue.nestedCues = [];
     nestedCue.payload = '';
     nestedCue.rubyTag = '';
+    // We don't want propagate some position settings
+    nestedCue.line = null;
+    nestedCue.region = new shaka.text.CueRegion();
+    nestedCue.position = null;
+    nestedCue.size = 0;
     if (element.nodeType === Node.ELEMENT_NODE && element.nodeName) {
       const bold = shaka.text.Cue.fontWeight.BOLD;
       const italic = shaka.text.Cue.fontStyle.ITALIC;

package/lib/transmuxer/aac_transmuxer.js

@@ -95,7 +95,7 @@ shaka.transmuxer.AacTransmuxer = class {
    * @override
    * @export
    */
-  getOrginalMimeType() {
+  getOriginalMimeType() {
     return this.originalMimeType_;
   }
 

package/lib/transmuxer/ac3_transmuxer.js

@@ -93,7 +93,7 @@ shaka.transmuxer.Ac3Transmuxer = class {
    * @override
    * @export
    */
-  getOrginalMimeType() {
+  getOriginalMimeType() {
     return this.originalMimeType_;
   }
 

package/lib/transmuxer/ec3_transmuxer.js

@@ -93,7 +93,7 @@ shaka.transmuxer.Ec3Transmuxer = class {
    * @override
    * @export
    */
-  getOrginalMimeType() {
+  getOriginalMimeType() {
     return this.originalMimeType_;
   }
 

package/lib/transmuxer/h264.js

@@ -175,7 +175,7 @@ shaka.transmuxer.H264 = class {
   static parseFrame(nalus) {
     const H264 = shaka.transmuxer.H264;
     let isKeyframe = false;
-    let data = new Uint8Array([]);
+    const nalusData = [];
     const spsNalu = nalus.find((nalu) => {
       return nalu.type == H264.NALU_TYPE_SPS_;
     });
@@ -240,13 +240,14 @@ shaka.transmuxer.H264 = class {
         naluLength[1] = (size >> 16) & 0xff;
         naluLength[2] = (size >> 8) & 0xff;
         naluLength[3] = size & 0xff;
-        data = shaka.util.Uint8ArrayUtils.concat(
-            data, naluLength, nalu.fullData);
+        nalusData.push(shaka.util.Uint8ArrayUtils.concat(
+            naluLength, nalu.fullData));
       }
     }
-    if (!data.byteLength) {
+    if (!nalusData.length) {
       return null;
     }
+    const data = shaka.util.Uint8ArrayUtils.concat(...nalusData);
     return {
       data,
       isKeyframe,

package/lib/transmuxer/h265.js

@@ -590,7 +590,7 @@ shaka.transmuxer.H265 = class {
   static parseFrame(nalus) {
     const H265 = shaka.transmuxer.H265;
     let isKeyframe = false;
-    let data = new Uint8Array([]);
+    const nalusData = [];
     let hvcSample = false;
     for (const nalu of nalus) {
       let push = false;
@@ -636,13 +636,14 @@ shaka.transmuxer.H265 = class {
         naluLength[1] = (size >> 16) & 0xff;
         naluLength[2] = (size >> 8) & 0xff;
         naluLength[3] = size & 0xff;
-        data = shaka.util.Uint8ArrayUtils.concat(
-            data, naluLength, nalu.fullData);
+        nalusData.push(shaka.util.Uint8ArrayUtils.concat(
+            naluLength, nalu.fullData));
       }
     }
-    if (!data.byteLength) {
+    if (!nalusData.length) {
       return null;
     }
+    const data = shaka.util.Uint8ArrayUtils.concat(...nalusData);
     return {
       data,
       isKeyframe,

package/lib/transmuxer/mp3_transmuxer.js

@@ -93,7 +93,7 @@ shaka.transmuxer.Mp3Transmuxer = class {
    * @override
    * @export
    */
-  getOrginalMimeType() {
+  getOriginalMimeType() {
     return this.originalMimeType_;
   }
 

package/lib/transmuxer/mpeg_ts_transmuxer.js

@@ -119,7 +119,7 @@ shaka.transmuxer.MpegTsTransmuxer = class {
    * @override
    * @export
    */
-  getOrginalMimeType() {
+  getOriginalMimeType() {
     return this.originalMimeType_;
   }
 

package/lib/transmuxer/mss_transmuxer.js

@@ -208,7 +208,7 @@ shaka.transmuxer.MssTransmuxer = class {
    * @override
    * @export
    */
-  getOrginalMimeType() {
+  getOriginalMimeType() {
     return this.originalMimeType_;
   }
 

package/lib/transmuxer/ts_transmuxer.js

@@ -75,7 +75,11 @@ shaka.transmuxer.TsTransmuxer = class {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
     const MimeUtils = shaka.util.MimeUtils;
 
-    const codecs = MimeUtils.getCodecs(mimeType);
+    let convertedMimeType = mimeType;
+    if (contentType) {
+      convertedMimeType = this.convertCodecs(contentType, mimeType);
+    }
+    const codecs = MimeUtils.getCodecs(convertedMimeType);
     const allCodecs = MimeUtils.splitCodecs(codecs);
 
     const audioCodec = shaka.util.ManifestParserUtils.guessCodecsSafe(
@@ -134,7 +138,8 @@ shaka.transmuxer.TsTransmuxer = class {
       // MediaSource.isTypeSupported('audio/mp4; codecs="mp4a.40.34"') -> false
       // MediaSource.isTypeSupported('audio/mp4; codecs="mp3"') -> true
       const codecs = shaka.util.MimeUtils.getCodecs(mimeType)
-          .replace('mp4a.40.34', 'mp3');
+          .replace('mp4a.40.34', 'mp3').split(',')
+          .map(this.getCorrectVideoCodecs_).join(',');
       if (contentType == ContentType.AUDIO) {
         return `audio/mp4; codecs="${codecs}"`;
       }
@@ -144,11 +149,34 @@ shaka.transmuxer.TsTransmuxer = class {
   }
 
 
+  /**
+   * @param {string} codec
+   * @return {string}
+   * @private
+   */
+  getCorrectVideoCodecs_(codec) {
+    if (codec.includes('avc1')) {
+      // Convert avc1 codec string from RFC-4281 to RFC-6381 for
+      // MediaSource.isTypeSupported
+      // Example, convert avc1.66.30 to avc1.42001e (0x42 == 66 and 0x1e == 30)
+      const avcdata = codec.split('.');
+      if (avcdata.length == 3) {
+        let result = avcdata.shift() + '.';
+        result += parseInt(avcdata.shift(), 10).toString(16);
+        result +=
+            ('000' + parseInt(avcdata.shift(), 10).toString(16)).slice(-4);
+        return result;
+      }
+    }
+    return codec;
+  }
+
+
   /**
    * @override
    * @export
    */
-  getOrginalMimeType() {
+  getOriginalMimeType() {
     return this.originalMimeType_;
   }
 
@@ -678,11 +706,7 @@ shaka.transmuxer.TsTransmuxer = class {
     const videoData = tsParser.getVideoData();
     for (let i = 0; i < videoData.length; i++) {
       const pes = videoData[i];
-      let nextPes;
-      if (i + 1 < videoData.length) {
-        nextPes = videoData[i + 1];
-      }
-      const dataNalus = tsParser.parseNalus(pes, nextPes);
+      const dataNalus = pes.nalus;
       nalus = nalus.concat(dataNalus);
       const frame = H264.parseFrame(dataNalus);
       if (!frame) {
@@ -768,11 +792,7 @@ shaka.transmuxer.TsTransmuxer = class {
     const videoData = tsParser.getVideoData();
     for (let i = 0; i < videoData.length; i++) {
       const pes = videoData[i];
-      let nextPes;
-      if (i + 1 < videoData.length) {
-        nextPes = videoData[i + 1];
-      }
-      const dataNalus = tsParser.parseNalus(pes, nextPes);
+      const dataNalus = pes.nalus;
       nalus = nalus.concat(dataNalus);
       const frame = H265.parseFrame(dataNalus);
       if (!frame) {

package/lib/util/buffer_utils.js

@@ -110,6 +110,23 @@ shaka.util.BufferUtils = class {
     return shaka.util.BufferUtils.view_(data, offset, length, Uint8Array);
   }
 
+  /**
+   * Creates a new Uint16Array view on the same buffer.  This clamps the values
+   * to be within the same view (i.e. you can't use this to move past the end
+   * of the view, even if the underlying buffer is larger).  However, you can
+   * pass a negative offset to access the data before the view.
+   *
+   * @param {BufferSource} data
+   * @param {number=} offset The offset from the beginning of this data's view
+   *   to start the new view at.
+   * @param {number=} length The byte length of the new view.
+   * @return {!Uint16Array}
+   * @export
+   */
+  static toUint16(data, offset = 0, length = Infinity) {
+    return shaka.util.BufferUtils.view_(data, offset, length, Uint16Array);
+  }
+
   /**
    * Creates a DataView over the given buffer.
    *
@@ -135,15 +152,20 @@ shaka.util.BufferUtils = class {
    */
   static view_(data, offset, length, Type) {
     const buffer = shaka.util.BufferUtils.unsafeGetArrayBuffer_(data);
+    let bytesPerElement = 1;
+    if ('BYTES_PER_ELEMENT' in Type) {
+      bytesPerElement = Type.BYTES_PER_ELEMENT;
+    }
     // Absolute end of the |data| view within |buffer|.
     /** @suppress {strictMissingProperties} */
-    const dataEnd = (data.byteOffset || 0) + data.byteLength;
+    const dataEnd = ((data.byteOffset || 0) + data.byteLength) /
+      bytesPerElement;
     // Absolute start of the result within |buffer|.
     /** @suppress {strictMissingProperties} */
-    const rawStart = (data.byteOffset || 0) + offset;
-    const start = Math.max(0, Math.min(rawStart, dataEnd));
+    const rawStart = ((data.byteOffset || 0) + offset) / bytesPerElement;
+    const start = Math.floor(Math.max(0, Math.min(rawStart, dataEnd)));
     // Absolute end of the result within |buffer|.
-    const end = Math.min(start + Math.max(length, 0), dataEnd);
+    const end = Math.floor(Math.min(start + Math.max(length, 0), dataEnd));
     return new Type(buffer, start, end - start);
   }
 };