shaka-player 4.7.1 → 4.7.3

package/lib/util/platform.js

@@ -234,10 +234,12 @@ shaka.util.Platform = class {
     return !!navigator.vendor && navigator.vendor.includes('Apple') &&
         !shaka.util.Platform.isTizen() &&
         !shaka.util.Platform.isEOS() &&
+        !shaka.util.Platform.isAPL() &&
         !shaka.util.Platform.isVirginMedia() &&
         !shaka.util.Platform.isOrange() &&
         !shaka.util.Platform.isPS4() &&
-        !shaka.util.Platform.isAmazonFireTV();
+        !shaka.util.Platform.isAmazonFireTV() &&
+        !shaka.util.Platform.isWPE();
   }
 
   /**
@@ -292,6 +294,14 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('AFT');
   }
 
+  /**
+   * Check if the current platform is Comcast X1.
+   * @return {boolean}
+   */
+  static isWPE() {
+    return shaka.util.Platform.userAgentContains_('WPE');
+  }
+
   /**
    * Returns a major version number for Safari, or Safari-based iOS browsers.
    *
@@ -348,6 +358,15 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('PC=EOS');
   }
 
+  /**
+   * Check if the current platform is an APL set-top box.
+   *
+   * @return {boolean}
+   */
+  static isAPL() {
+    return shaka.util.Platform.userAgentContains_('PC=APL');
+  }
+
   /**
    * Guesses if the platform is a mobile one (iOS or Android).
    *

package/lib/util/ts_parser.js

@@ -32,7 +32,7 @@ shaka.util.TsParser = class {
     /** @private {?string} */
     this.videoCodec_ = null;
 
-    /** @private {!Array.<Uint8Array>} */
+    /** @private {!Array.<!Array.<Uint8Array>>} */
     this.videoData_ = [];
 
     /** @private {!Array.<shaka.extern.MPEG_PES>} */
@@ -44,7 +44,7 @@ shaka.util.TsParser = class {
     /** @private {?string} */
     this.audioCodec_ = null;
 
-    /** @private {!Array.<Uint8Array>} */
+    /** @private {!Array.<!Array.<Uint8Array>>} */
     this.audioData_ = [];
 
     /** @private {!Array.<shaka.extern.MPEG_PES>} */
@@ -53,7 +53,7 @@ shaka.util.TsParser = class {
     /** @private {?number} */
     this.id3Pid_ = null;
 
-    /** @private {!Array.<Uint8Array>} */
+    /** @private {!Array.<!Array.<Uint8Array>>} */
     this.id3Data_ = [];
   }
 
@@ -79,7 +79,6 @@ shaka.util.TsParser = class {
    */
   parse(data) {
     const packetLength = shaka.util.TsParser.PacketLength_;
-    const Uint8ArrayUtils = shaka.util.Uint8ArrayUtils;
 
     // A TS fragment should contain at least 3 TS packets, a PAT, a PMT, and
     // one PID.
@@ -162,12 +161,11 @@ shaka.util.TsParser = class {
           case this.videoPid_: {
             const videoData = data.subarray(offset, start + packetLength);
             if (payloadUnitStartIndicator) {
-              this.videoData_.push(videoData);
+              this.videoData_.push([videoData]);
             } else if (this.videoData_.length) {
               const prevVideoData = this.videoData_[this.videoData_.length - 1];
               if (prevVideoData) {
-                this.videoData_[this.videoData_.length - 1] =
-                    Uint8ArrayUtils.concat(prevVideoData, videoData);
+                this.videoData_[this.videoData_.length - 1].push(videoData);
               }
             }
             break;
@@ -175,12 +173,11 @@ shaka.util.TsParser = class {
           case this.audioPid_: {
             const audioData = data.subarray(offset, start + packetLength);
             if (payloadUnitStartIndicator) {
-              this.audioData_.push(audioData);
+              this.audioData_.push([audioData]);
             } else if (this.audioData_.length) {
               const prevAudioData = this.audioData_[this.audioData_.length - 1];
               if (prevAudioData) {
-                this.audioData_[this.audioData_.length - 1] =
-                    Uint8ArrayUtils.concat(prevAudioData, audioData);
+                this.audioData_[this.audioData_.length - 1].push(audioData);
               }
             }
             break;
@@ -188,12 +185,11 @@ shaka.util.TsParser = class {
           case this.id3Pid_: {
             const id3Data = data.subarray(offset, start + packetLength);
             if (payloadUnitStartIndicator) {
-              this.id3Data_.push(id3Data);
+              this.id3Data_.push([id3Data]);
             } else if (this.id3Data_.length) {
               const prevId3Data = this.id3Data_[this.id3Data_.length - 1];
               if (prevId3Data) {
-                this.id3Data_[this.id3Data_.length - 1] =
-                    Uint8ArrayUtils.concat(prevId3Data, id3Data);
+                this.id3Data_[this.id3Data_.length - 1].push(id3Data);
               }
             }
             break;
@@ -588,7 +584,8 @@ shaka.util.TsParser = class {
   getMetadata() {
     const timescale = shaka.util.TsParser.Timescale;
     const metadata = [];
-    for (const id3Data of this.id3Data_) {
+    for (const id3DataArray of this.id3Data_) {
+      const id3Data = shaka.util.Uint8ArrayUtils.concat(...id3DataArray);
       const pes = this.parsePES_(id3Data);
       if (pes) {
         metadata.push({
@@ -612,7 +609,8 @@ shaka.util.TsParser = class {
   getAudioData() {
     if (this.audioData_.length && !this.audioPes_.length) {
       let sort = false;
-      for (const audioData of this.audioData_) {
+      for (const audioDataArray of this.audioData_) {
+        const audioData = shaka.util.Uint8ArrayUtils.concat(...audioDataArray);
         const pes = this.parsePES_(audioData);
         let previousPes = this.audioPes_.length ?
             this.audioPes_[this.audioPes_.length - 1] : null;
@@ -654,7 +652,8 @@ shaka.util.TsParser = class {
   getVideoData(naluProcessing = true) {
     if (this.videoData_.length && !this.videoPes_.length) {
       let sort = false;
-      for (const videoData of this.videoData_) {
+      for (const videoDataArray of this.videoData_) {
+        const videoData = shaka.util.Uint8ArrayUtils.concat(...videoDataArray);
         const pes = this.parsePES_(videoData);
         let previousPes = this.videoPes_.length ?
             this.videoPes_[this.videoPes_.length - 1] : null;

package/lib/util/uint8array_utils.js

@@ -107,21 +107,26 @@ shaka.util.Uint8ArrayUtils = class {
    * @export
    */
   static concat(...varArgs) {
+    const BufferUtils = shaka.util.BufferUtils;
     let totalLength = 0;
-    for (const arr of varArgs) {
-      totalLength += arr.byteLength;
+    for (let i = 0; i < varArgs.length; ++i) {
+      const value = varArgs[i];
+      totalLength += value.byteLength;
     }
 
     const result = new Uint8Array(totalLength);
     let offset = 0;
-    for (const arr of varArgs) {
-      if (arr instanceof Uint8Array) {
-        result.set(arr, offset);
+
+    for (let i = 0; i < varArgs.length; ++i) {
+      const value = varArgs[i];
+      if (value instanceof Uint8Array) {
+        result.set(value, offset);
       } else {
-        result.set(shaka.util.BufferUtils.toUint8(arr), offset);
+        result.set(BufferUtils.toUint8(value), offset);
       }
-      offset += arr.byteLength;
+      offset += value.byteLength;
     }
+
     return result;
   }
 };

package/package.json

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

package/ui/controls.js

@@ -652,7 +652,8 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
   isPiPAllowed() {
     if ('documentPictureInPicture' in window &&
         this.config_.preferDocumentPictureInPicture) {
-      return true;
+      const video = /** @type {HTMLVideoElement} */(this.localVideo_);
+      return !video.disablePictureInPicture;
     }
     if (document.pictureInPictureEnabled) {
       const video = /** @type {HTMLVideoElement} */(this.localVideo_);

package/ui/hidden_seek_button.js

@@ -44,7 +44,11 @@ shaka.ui.HiddenSeekButton = class extends shaka.ui.Element {
     this.seekContainer = shaka.util.Dom.createHTMLElement('div');
     this.parent.appendChild(this.seekContainer);
 
-    this.eventManager.listen(this.seekContainer, 'touchstart', (event) => {
+    this.eventManager.listen(this.seekContainer, 'touchend', (event) => {
+      // Do nothing if the controls are not visible
+      if (!this.controls.isOpaque()) {
+        return;
+      }
       // In case any settings menu are open this assigns the first touch
       // to close the menu.
       if (this.controls.anySettingsMenusAreOpen()) {