shaka-player 4.7.11 → 4.7.13

package/lib/util/ts_parser.js

@@ -10,6 +10,7 @@ goog.require('shaka.Deprecate');
 goog.require('shaka.log');
 goog.require('shaka.util.ExpGolomb');
 goog.require('shaka.util.Id3Utils');
+goog.require('shaka.util.StringUtils');
 goog.require('shaka.util.Uint8ArrayUtils');
 
 
@@ -55,6 +56,12 @@ shaka.util.TsParser = class {
 
     /** @private {!Array.<!Array.<Uint8Array>>} */
     this.id3Data_ = [];
+
+    /** @private {?number} */
+    this.referencePts_ = null;
+
+    /** @private {?number} */
+    this.referenceDts_ = null;
   }
 
   /**
@@ -227,6 +234,7 @@ shaka.util.TsParser = class {
    * @private
    */
   parsePMT_(data, offset) {
+    const StringUtils = shaka.util.StringUtils;
     const result = {
       audio: -1,
       video: -1,
@@ -249,26 +257,52 @@ shaka.util.TsParser = class {
         case 0x06:
           // stream_type 6 can mean a lot of different things in case of DVB.
           // We need to look at the descriptors. Right now, we're only
-          // interested in AC-3 and EC-3 audio, so we do the descriptor parsing
-          // only when we don't have an audio PID yet.
-          if (result.audio == -1 && esInfoLength > 0) {
+          // interested in a few audio and video formats,.
+          if (esInfoLength > 0) {
             let parsePos = offset + 5;
             let remaining = esInfoLength;
+            // Descriptor info: https://www.streamguru.de/mpeg-analyzer/supported-descriptor-list/
             while (remaining > 2) {
               const descriptorId = data[parsePos];
+              const descriptorLen = data[parsePos + 1] + 2;
               switch (descriptorId) {
+                // Registration descriptor
+                case 0x05: {
+                  const registrationData =
+                      data.subarray(parsePos + 2, parsePos + descriptorLen);
+                  const registration =
+                      StringUtils.fromCharCode(registrationData);
+                  if (result.audio == -1 && registration === 'Opus') {
+                    result.audio = pid;
+                    result.audioCodec = 'opus';
+                  } else if (result.video == -1 && registration === 'AV01') {
+                    result.video = pid;
+                    result.videoCodec = 'av1';
+                  }
+                  break;
+                }
                 // DVB Descriptor for AC-3
                 case 0x6a:
-                  result.audio = pid;
-                  result.audioCodec = 'ac3';
+                  if (result.audio == -1) {
+                    result.audio = pid;
+                    result.audioCodec = 'ac3';
+                  }
                   break;
                 // DVB Descriptor for EC-3
                 case 0x7a:
-                  result.audio = pid;
-                  result.audioCodec = 'ec3';
+                  if (result.audio == -1) {
+                    result.audio = pid;
+                    result.audioCodec = 'ec3';
+                  }
+                  break;
+                // DVB Descriptor for AAC
+                case 0x7c:
+                  if (result.audio == -1) {
+                    result.audio = pid;
+                    result.audioCodec = 'aac';
+                  }
                   break;
               }
-              const descriptorLen = data[parsePos + 1] + 2;
               parsePos += descriptorLen;
               remaining -= descriptorLen;
             }
@@ -284,6 +318,13 @@ shaka.util.TsParser = class {
             result.audioCodec = 'aac';
           }
           break;
+        // LOAS/LATM AAC
+        case 0x11:
+          if (result.audio == -1) {
+            result.audio = pid;
+            result.audioCodec = 'aac-loas';
+          }
+          break;
         // Packetized metadata (ID3)
         case 0x15:
           if (result.id3 == -1) {
@@ -390,22 +431,36 @@ shaka.util.TsParser = class {
       // the PTS and DTS are not written out directly. For information
       // on how they are encoded, see
       // http://dvd.sourceforge.net/dvdinfo/pes-hdr.html
-      pes.pts =
+      const pts =
         (data[9] & 0x0e) * 536870912 + // 1 << 29
         (data[10] & 0xff) * 4194304 + // 1 << 22
         (data[11] & 0xfe) * 16384 + // 1 << 14
         (data[12] & 0xff) * 128 + // 1 << 7
         (data[13] & 0xfe) / 2;
 
+      if (this.referencePts_ == null) {
+        this.referencePts_ = pts;
+      }
+
+      pes.pts = this.handleRollover_(pts, this.referencePts_);
+      this.referencePts_ = pes.pts;
+
       pes.dts = pes.pts;
       if (ptsDtsFlags & 0x40) {
-        pes.dts =
+        const dts =
           (data[14] & 0x0e) * 536870912 + // 1 << 29
           (data[15] & 0xff) * 4194304 + // 1 << 22
           (data[16] & 0xfe) * 16384 + // 1 << 14
           (data[17] & 0xff) * 128 + // 1 << 7
           (data[18] & 0xfe) / 2;
+
+        if (this.referenceDts_ == null) {
+          this.referenceDts_ = dts;
+        }
+
+        pes.dts = this.handleRollover_(dts, this.referenceDts_);
       }
+      this.referenceDts_ = pes.dts;
     }
 
     const pesHdrLen = data[8];
@@ -1069,6 +1124,40 @@ shaka.util.TsParser = class {
     return ('0' + x.toString(16).toUpperCase()).slice(-2);
   }
 
+  /**
+   * @param {number} value
+   * @param {number} reference
+   * @return {number}
+   * @private
+   */
+  handleRollover_(value, reference) {
+    const MAX_TS = 8589934592;
+    const RO_THRESH = 4294967296;
+
+    let direction = 1;
+
+    if (value > reference) {
+      // If the current timestamp value is greater than our reference timestamp
+      // and we detect a timestamp rollover, this means the roll over is
+      // happening in the opposite direction.
+      // Example scenario: Enter a long stream/video just after a rollover
+      // occurred. The reference point will be set to a small number, e.g. 1.
+      // The user then seeks backwards over the rollover point. In loading this
+      // segment, the timestamp values will be very large, e.g. 2^33 - 1. Since
+      // this comes before the data we loaded previously, we want to adjust the
+      // time stamp to be `value - 2^33`.
+      direction = -1;
+    }
+
+    // Note: A seek forwards or back that is greater than the RO_THRESH
+    // (2^32, ~13 hours) will cause an incorrect adjustment.
+    while (Math.abs(reference - value) > RO_THRESH) {
+      value += (direction * MAX_TS);
+    }
+
+    return value;
+  }
+
   /**
    * Check if the passed data corresponds to an MPEG2-TS
    *

package/package.json

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

package/lib/polyfill/storage_estimate.js

@@ -1,57 +0,0 @@
-/*! @license
- * Shaka Player
- * Copyright 2016 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-goog.provide('shaka.polyfill.StorageEstimate');
-
-goog.require('shaka.polyfill');
-
-
-/**
- * @summary A polyfill to provide navigator.storage.estimate in old
- * webkit browsers.
- * See: https://developers.google.com/web/updates/2017/08/estimating-available-storage-space#the-present
- * @export
- */
-shaka.polyfill.StorageEstimate = class {
-  /**
-   * Install the polyfill if needed.
-   * @export
-   */
-  static install() {
-    if (navigator.storage && navigator.storage.estimate) {
-      // No need.
-      return;
-    }
-
-    if (navigator.webkitTemporaryStorage &&
-        navigator.webkitTemporaryStorage.queryUsageAndQuota) {
-      if (!('storage' in navigator)) {
-        navigator.storage = /** @type {!StorageManager} */ ({});
-      }
-      navigator.storage.estimate =
-          shaka.polyfill.StorageEstimate.storageEstimate_;
-    }
-  }
-
-  /**
-   * @this {StorageManager}
-   * @return {!Promise}
-   * @private
-   */
-  static storageEstimate_() {
-    return new Promise((resolve, reject) => {
-      navigator.webkitTemporaryStorage.queryUsageAndQuota(
-          (usage, quota) => {
-            resolve({usage: usage, quota: quota});
-          },
-          reject,
-      );
-    });
-  }
-};
-
-
-shaka.polyfill.register(shaka.polyfill.StorageEstimate.install);