shaka-player 4.7.12 → 4.8.0

package/lib/util/periods.js

@@ -45,6 +45,9 @@ shaka.util.PeriodCombiner = class {
     /** @private {boolean} */
     this.multiTypeVariantsAllowed_ = false;
 
+    /** @private {boolean} */
+    this.useStreamOnce_ = false;
+
     /**
      * The IDs of the periods we have already used to generate streams.
      * This helps us identify the periods which have been added when a live
@@ -599,14 +602,6 @@ shaka.util.PeriodCombiner = class {
         goog.asserts.assert(match.segmentIndex,
             'stream should have a segmentIndex.');
         if (match.segmentIndex) {
-          match.segmentIndex.forEachTopLevelReference((ref) => {
-            ref.codecs = match.codecs;
-            ref.mimeType = match.mimeType;
-            if (ref.initSegmentReference) {
-              ref.initSegmentReference.codecs = match.codecs;
-              ref.initSegmentReference.mimeType = match.mimeType;
-            }
-          });
           outputStream.segmentIndex.appendSegmentIndex(match.segmentIndex);
         }
       }
@@ -721,41 +716,16 @@ shaka.util.PeriodCombiner = class {
 
       if (used) {
         unusedStreamsPerPeriod[i].delete(match);
-        // Add the codec of this stream to the output stream's codecs.
-        const codecs = new Set(outputStream.codecs.split(','));
-        for (const codec of match.codecs.split(',')) {
-          if (codec) {
-            codecs.add(codec);
+        // Add the full mimetypes to the stream.
+        if (match.fullMimeTypes) {
+          for (const fullMimeType of match.fullMimeTypes.values()) {
+            outputStream.fullMimeTypes.add(fullMimeType);
           }
         }
-        const PeriodCombiner = shaka.util.PeriodCombiner;
-        outputStream.codecs = PeriodCombiner.filterDuplicateCodecs_(
-            Array.from(codecs)).join(',');
       }
     }
   }
 
-  /**
-   * @param {!Array.<string>} codecs
-   * @return {!Array.<string>} codecs
-   * @private
-   */
-  static filterDuplicateCodecs_(codecs) {
-    // Filter out duplicate codecs.
-    const seen = new Set();
-    const ret = [];
-    for (const codec of codecs) {
-      const shortCodec = shaka.util.MimeUtils.getCodecBase(codec);
-      if (!seen.has(shortCodec)) {
-        ret.push(codec);
-        seen.add(shortCodec);
-      } else {
-        shaka.log.debug('Ignoring duplicate codec');
-      }
-    }
-    return ret;
-  }
-
   /**
    * Clone a Stream to make an output Stream for combining others across
    * periods.
@@ -1041,6 +1011,12 @@ shaka.util.PeriodCombiner = class {
       }
     }
 
+    // Remove just found stream if configured to, so possible future linear
+    // searches can be faster.
+    if (this.useStreamOnce_ && !shaka.util.PeriodCombiner.isDummy_(best)) {
+      streams.delete(getKey(best));
+    }
+
     return best;
   }
 
@@ -1075,11 +1051,21 @@ shaka.util.PeriodCombiner = class {
   /**
    * @param {boolean} allowed If set to true, multi-mimeType or multi-codec
    *   variants will be allowed.
+   * @export
    */
   setAllowMultiTypeVariants(allowed) {
     this.multiTypeVariantsAllowed_ = allowed;
   }
 
+  /**
+   * @param {boolean} useOnce if true, stream will be used only once in period
+   *   flattening algoritnm.
+   * @export
+   */
+  setUseStreamOnce(useOnce) {
+    this.useStreamOnce_ = useOnce;
+  }
+
   /**
    * @param {T} outputStream An audio or video output stream
    * @param {T} candidate A candidate stream to be combined with the output
@@ -1578,6 +1564,7 @@ shaka.util.PeriodCombiner = class {
       accessibilityPurpose: null,
       external: false,
       fastSwitching: false,
+      fullMimeTypes: new Set(),
     };
   }
 

package/lib/util/platform.js

@@ -6,6 +6,7 @@
 
 goog.provide('shaka.util.Platform');
 
+goog.require('shaka.log');
 goog.require('shaka.util.Timer');
 
 
@@ -149,10 +150,9 @@ shaka.util.Platform = class {
    * @return {boolean}
    */
   static isWebOS3() {
-    // See: http://webostv.developer.lge.com/discover/specifications/web-engine/
-    return shaka.util.Platform.userAgentContains_('Web0S') &&
-        shaka.util.Platform.userAgentContains_(
-            'Chrome/38.0.2125.122 Safari/537.36');
+    // See: https://webostv.developer.lge.com/develop/specifications/web-api-and-web-engine#useragent-string
+    return shaka.util.Platform.isWebOS() &&
+        shaka.util.Platform.chromeVersion() === 38;
   }
 
   /**
@@ -161,18 +161,20 @@ shaka.util.Platform = class {
    * @return {boolean}
    */
   static isWebOS4() {
-    // See: http://webostv.developer.lge.com/discover/specifications/web-engine/
-    return !!navigator.userAgent.match(/webOS\/4/i);
+    // See: https://webostv.developer.lge.com/develop/specifications/web-api-and-web-engine#useragent-string
+    return shaka.util.Platform.isWebOS() &&
+        shaka.util.Platform.chromeVersion() === 53;
   }
 
   /**
-   * Check if the current platform is a WebOS 4.
+   * Check if the current platform is a WebOS 5.
    *
    * @return {boolean}
    */
   static isWebOS5() {
-    // See: http://webostv.developer.lge.com/discover/specifications/web-engine/
-    return !!navigator.userAgent.match(/webOS\/5/i);
+    // See: https://webostv.developer.lge.com/develop/specifications/web-api-and-web-engine#useragent-string
+    return shaka.util.Platform.isWebOS() &&
+        shaka.util.Platform.chromeVersion() === 68;
   }
 
   /**
@@ -440,6 +442,25 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('Android');
   }
 
+  /**
+   * Return true if the platform is controlled by a remote control.
+   *
+   * @return {boolean}
+   */
+  static isSmartTV() {
+    const Platform = shaka.util.Platform;
+    if (Platform.isTizen() || Platform.isWebOS() ||
+        Platform.isXboxOne() || Platform.isPS4() ||
+        Platform.isPS5() || Platform.isAmazonFireTV() ||
+        Platform.isEOS() || Platform.isAPL() ||
+        Platform.isVirginMedia() || Platform.isOrange() ||
+        Platform.isWPE() || Platform.isChromecast() ||
+        Platform.isHisense()) {
+      return true;
+    }
+    return false;
+  }
+
   /**
    * Check if the user agent contains a key. This is the best way we know of
    * right now to detect platforms. If there is a better way, please send a
@@ -554,6 +575,137 @@ shaka.util.Platform = class {
 
     return false;
   }
+
+  /**
+   * Detect the maximum resolution that the platform's hardware can handle.
+   *
+   * @return {!Promise.<{width: number, height: number}>}
+   */
+  static async detectMaxHardwareResolution() {
+    const Platform = shaka.util.Platform;
+    const maxResolution = {
+      width: Infinity,
+      height: Infinity,
+    };
+
+    if (Platform.isChromecast()) {
+      // In our tests, the original Chromecast seems to have trouble decoding
+      // above 1080p.  It would be a waste to select a higher res anyway, given
+      // that the device only outputs 1080p to begin with.
+      // Chromecast has an extension to query the device/display's resolution.
+      if (window.cast && cast.__platform__ &&
+          cast.__platform__.canDisplayType && cast.__platform__.canDisplayType(
+          'video/mp4; codecs="avc1.640028"; width=3840; height=2160')) {
+        // The device and display can both do 4k.  Assume a 4k limit.
+        maxResolution.width = 3840;
+        maxResolution.height = 2160;
+      } else {
+        // Chromecast has always been able to do 1080p.  Assume a 1080p limit.
+        maxResolution.width = 1920;
+        maxResolution.height = 1080;
+      }
+    } else if (Platform.isTizen()) {
+      maxResolution.width = 1920;
+      maxResolution.height = 1080;
+      try {
+        if (webapis.systeminfo && webapis.systeminfo.getMaxVideoResolution) {
+          const maxVideoResolution =
+              webapis.systeminfo.getMaxVideoResolution();
+          maxResolution.width = maxVideoResolution.width;
+          maxResolution.height = maxVideoResolution.height;
+        } else {
+          if (webapis.productinfo.is8KPanelSupported &&
+              webapis.productinfo.is8KPanelSupported()) {
+            maxResolution.width = 7680;
+            maxResolution.height = 4320;
+          } else if (webapis.productinfo.isUdPanelSupported &&
+              webapis.productinfo.isUdPanelSupported()) {
+            maxResolution.width = 3840;
+            maxResolution.height = 2160;
+          }
+        }
+      } catch (e) {
+        shaka.log.alwaysWarn('Tizen: Error detecting screen size, default ' +
+            'screen size 1920x1080.');
+      }
+    } else if (Platform.isXboxOne()) {
+      const protectionCapabilities =
+          new Windows.Media.Protection.ProtectionCapabilities();
+      const protectionResult =
+          Windows.Media.Protection.ProtectionCapabilityResult;
+      // isTypeSupported may return "maybe", which means the operation is not
+      // completed. This means we need to retry
+      // https://learn.microsoft.com/en-us/uwp/api/windows.media.protection.protectioncapabilityresult?view=winrt-22621
+      let result = null;
+      try {
+        const type =
+            'video/mp4;codecs="hvc1,mp4a";features="decode-res-x=3840,' +
+            'decode-res-y=2160,decode-bitrate=20000,decode-fps=30,' +
+            'decode-bpc=10,display-res-x=3840,display-res-y=2160,' +
+            'display-bpc=8"';
+        const keySystem = 'com.microsoft.playready.recommendation';
+        do {
+          result = protectionCapabilities.isTypeSupported(type, keySystem);
+        } while (result === protectionResult.maybe);
+      } catch (e) {
+        result = protectionResult.notSupported;
+      }
+      if (result === protectionResult.probably) {
+        maxResolution.width = 3840;
+        maxResolution.height = 2160;
+      } else {
+        maxResolution.width = 1920;
+        maxResolution.height = 1080;
+      }
+    } else if (Platform.isWebOS()) {
+      try {
+        const deviceInfo =
+        /** @type {{screenWidth: number, screenHeight: number}} */(
+            JSON.parse(window.PalmSystem.deviceInfo));
+        // WebOS has always been able to do 1080p.  Assume a 1080p limit.
+        maxResolution.width = Math.max(1920, deviceInfo.screenWidth);
+        maxResolution.height = Math.max(1080, deviceInfo.screenHeight);
+      } catch (e) {
+        shaka.log.alwaysWarn('WebOS: Error detecting screen size, default ' +
+            'screen size 1920x1080.');
+        maxResolution.width = 1920;
+        maxResolution.height = 1080;
+      }
+    } else if (Platform.isHisense()) {
+      // eslint-disable-next-line new-cap
+      if (window.Hisense_Get4KSupportState &&
+          // eslint-disable-next-line new-cap
+          window.Hisense_Get4KSupportState()) {
+        maxResolution.width = 3840;
+        maxResolution.height = 2160;
+      } else {
+        maxResolution.width = 1920;
+        maxResolution.height = 1080;
+      }
+    } else if (Platform.isPS4() || Platform.isPS5()) {
+      let supports4K = false;
+      try {
+        const result = await window.msdk.device.getDisplayInfo();
+        supports4K = result.resolution === '4K';
+      } catch (e) {
+        try {
+          const result = await window.msdk.device.getDisplayInfoImmediate();
+          supports4K = result.resolution === '4K';
+        } catch (e) {
+          shaka.log.alwaysWarn(
+              'PlayStation: Failed to get the display info:', e);
+        }
+      }
+      if (supports4K) {
+        maxResolution.width = 3840;
+        maxResolution.height = 2160;
+      } else {
+        maxResolution.width = 1920;
+        maxResolution.height = 1080;
+      }
+    }
+    return maxResolution;
+  }
 };
 
 /** @private {shaka.util.Timer} */

package/lib/util/player_configuration.js

@@ -94,6 +94,13 @@ shaka.util.PlayerConfiguration = class {
       ignoreDuplicateInitData: !shaka.util.Platform.isTizen2(),
     };
 
+    // The Xbox One and PS4 only support the Playready DRM, so they should
+    // prefer that key system by default to improve startup performance.
+    if (shaka.util.Platform.isXboxOne() ||
+        shaka.util.Platform.isPS4()) {
+      drm.preferredKeySystems.push('com.microsoft.playready');
+    }
+
     let codecSwitchingStrategy = shaka.config.CodecSwitchingStrategy.RELOAD;
     let multiTypeVariantsAllowed = false;
     if (shaka.util.Platform.supportsSmoothCodecSwitching()) {
@@ -133,17 +140,22 @@ shaka.util.PlayerConfiguration = class {
             'com.microsoft.playready',
           'urn:uuid:79f0049a-4098-8642-ab92-e65be0885f95':
             'com.microsoft.playready',
-          'urn:uuid:f239e769-efa3-4850-9c16-a903c6932efb':
-            'com.adobe.primetime',
         },
         manifestPreprocessor: (element) => {
           return shaka.util.ConfigUtils.referenceParametersAndReturn(
               [element],
               element);
         },
+        manifestPreprocessorTXml: (element) => {
+          return shaka.util.ConfigUtils.referenceParametersAndReturn(
+              [element],
+              element);
+        },
         sequenceMode: false,
         enableAudioGroups: false,
         multiTypeVariantsAllowed,
+        useStreamOnceInPeriodFlattening: false,
+        updatePeriod: -1,
       },
       hls: {
         ignoreTextStreamFailures: false,
@@ -151,6 +163,7 @@ shaka.util.PlayerConfiguration = class {
         defaultAudioCodec: 'mp4a.40.2',
         defaultVideoCodec: 'avc1.42E01E',
         ignoreManifestProgramDateTime: false,
+        ignoreManifestProgramDateTimeForTypes: [],
         mediaPlaylistFullMimeType:
             'video/mp2t; codecs="avc1.42E01E, mp4a.40.2"',
         useSafariBehaviorForLive: true,
@@ -166,6 +179,11 @@ shaka.util.PlayerConfiguration = class {
               [element],
               element);
         },
+        manifestPreprocessorTXml: (element) => {
+          return shaka.util.ConfigUtils.referenceParametersAndReturn(
+              [element],
+              element);
+        },
         sequenceMode: false,
         keySystemsBySystemId: {
           '9a04f079-9840-4286-ab92-e65be0885f95':
@@ -192,6 +210,7 @@ shaka.util.PlayerConfiguration = class {
       rebufferingGoal: 2,
       bufferingGoal: 10,
       bufferBehind: 30,
+      evictionGoal: 1,
       ignoreTextStreamFailures: false,
       alwaysStreamText: false,
       startAtSegmentBoundary: false,
@@ -205,6 +224,7 @@ shaka.util.PlayerConfiguration = class {
       stallThreshold: 1 /* seconds */,
       stallSkip: 0.1 /* seconds */,
       useNativeHlsOnSafari: true,
+      useNativeHlsForFairPlay: true,
       // If we are within 2 seconds of the start of a live segment, fetch the
       // previous one.  This allows for segment drift, but won't download an
       // extra segment if we aren't close to the start.
@@ -223,13 +243,23 @@ shaka.util.PlayerConfiguration = class {
       // When low latency streaming is enabled, segmentPrefetchLimit will
       // default to 2 if not specified.
       segmentPrefetchLimit: 0,
+      prefetchAudioLanguages: [],
+      disableAudioPrefetch: false,
+      disableTextPrefetch: false,
+      disableVideoPrefetch: false,
       liveSync: false,
       liveSyncMaxLatency: 1,
       liveSyncPlaybackRate: 1.1,
       liveSyncMinLatency: 0,
       liveSyncMinPlaybackRate: 1,
+      liveSyncPanicMode: false,
+      liveSyncPanicThreshold: 60,
       allowMediaSourceRecoveries: true,
       minTimeBetweenRecoveries: 5,
+      vodDynamicPlaybackRate: false,
+      vodDynamicPlaybackRateLowBufferRate: 0.95,
+      vodDynamicPlaybackRateBufferRatio: 0.5,
+      infiniteLiveStreamDuration: false,
     };
 
     // WebOS, Tizen, Chromecast and Hisense have long hardware pipelines
@@ -316,7 +346,9 @@ shaka.util.PlayerConfiguration = class {
       enabled: false,
       sessionId: '',
       contentId: '',
+      rtpSafetyFactor: 5,
       useHeaders: false,
+      includeKeys: [],
     };
 
     const cmsd = {
@@ -334,13 +366,38 @@ shaka.util.PlayerConfiguration = class {
 
     const mediaSource = {
       codecSwitchingStrategy: codecSwitchingStrategy,
-      sourceBufferExtraFeatures: '',
+      addExtraFeaturesToSourceBuffer: (mimeType) => {
+        return shaka.util.ConfigUtils.referenceParametersAndReturn(
+            [mimeType],
+            '');
+      },
       forceTransmux: false,
       insertFakeEncryptionInInit: true,
+      modifyCueCallback: (cue, uri) => {
+        return shaka.util.ConfigUtils.referenceParametersAndReturn(
+            [cue, uri],
+            undefined);
+      },
     };
 
+    let skipPlayDetection = false;
+    if (shaka.util.Platform.isWebOS() ||
+        shaka.util.Platform.isTizen() ||
+        shaka.util.Platform.isChromecast() ||
+        shaka.util.Platform.isHisense() ||
+        shaka.util.Platform.isPS5() ||
+        shaka.util.Platform.isPS4() ||
+        shaka.util.Platform.isXboxOne()) {
+      skipPlayDetection = true;
+    }
+
     const ads = {
       customPlayheadTracker: false,
+      skipPlayDetection,
+    };
+
+    const textDisplayer = {
+      captionsUpdatePeriod: 0.25,
     };
 
     const AutoShowText = shaka.config.AutoShowText;
@@ -383,6 +440,7 @@ shaka.util.PlayerConfiguration = class {
       },
       playRangeStart: 0,
       playRangeEnd: Infinity,
+      textDisplayer: textDisplayer,
       textDisplayFactory: () => null,
       cmcd: cmcd,
       cmsd: cmsd,

package/lib/util/stats.js

@@ -62,6 +62,9 @@ shaka.util.Stats = class {
     /** @private {number} */
     this.bandwidthEstimate_ = NaN;
 
+    /** @private {number} */
+    this.bytesDownloaded_ = NaN;
+
     /** @private {!shaka.util.StateHistory} */
     this.stateHistory_ = new shaka.util.StateHistory();
 
@@ -203,6 +206,17 @@ shaka.util.Stats = class {
     this.bandwidthEstimate_ = bandwidth;
   }
 
+  /**
+   * @param {number} bytesDownloaded
+   */
+  addBytesDownloaded(bytesDownloaded) {
+    if (isNaN(this.bytesDownloaded_)) {
+      this.bytesDownloaded_ = bytesDownloaded;
+    } else {
+      this.bytesDownloaded_ += bytesDownloaded;
+    }
+  }
+
   /**
    * @return {!shaka.util.StateHistory}
    */
@@ -244,6 +258,7 @@ shaka.util.Stats = class {
       licenseTime: this.licenseTimeSeconds_,
       liveLatency: this.liveLatencySeconds_,
       maxSegmentDuration: this.maxSegmentDurationSeconds_,
+      bytesDownloaded: this.bytesDownloaded_,
       stateHistory: this.stateHistory_.getCopy(),
       switchHistory: this.switchHistory_.getCopy(),
     };
@@ -276,6 +291,7 @@ shaka.util.Stats = class {
       licenseTime: NaN,
       liveLatency: NaN,
       maxSegmentDuration: NaN,
+      bytesDownloaded: NaN,
       switchHistory: [],
       stateHistory: [],
     };