shaka-player 3.3.5 → 4.0.2

package/lib/text/vtt_text_parser.js

@@ -22,6 +22,12 @@ goog.require('shaka.util.XmlUtils');
  * @export
  */
 shaka.text.VttTextParser = class {
+  /** Constructs a VTT parser. */
+  constructor() {
+    /** @private {boolean} */
+    this.sequenceMode_ = false;
+  }
+
   /**
    * @override
    * @export
@@ -30,6 +36,14 @@ shaka.text.VttTextParser = class {
     goog.asserts.assert(false, 'VTT does not have init segments');
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setSequenceMode(sequenceMode) {
+    this.sequenceMode_ = sequenceMode;
+  }
+
   /**
    * @override
    * @export
@@ -48,11 +62,21 @@ shaka.text.VttTextParser = class {
           shaka.util.Error.Code.INVALID_TEXT_HEADER);
     }
 
+    // Depending on "segmentRelativeVttTiming" configuration,
+    // "vttOffset" will correspond to either "periodStart" (default)
+    // or "segmentStart", for segmented VTT where timings are relative
+    // to the beginning of each segment.
     // NOTE: "periodStart" is the timestamp offset applied via TextEngine.
     // It is no longer closely tied to periods, but the name stuck around.
-    let offset = time.periodStart;
-
-    if (blocks[0].includes('X-TIMESTAMP-MAP')) {
+    // NOTE: This offset and the flag choosing its meaning have no effect on
+    // HLS content, which should use X-TIMESTAMP-MAP and periodStart instead.
+    let offset = time.vttOffset;
+
+    // Only use 'X-TIMESTAMP-MAP' in sequence mode, as that is currently
+    // shorthand for HLS.  Note that an offset based on the first video
+    // timestamp has already been extracted, and appears in periodStart.
+    // The relative offset from X-TIMESTAMP-MAP will be added to that for HLS.
+    if (blocks[0].includes('X-TIMESTAMP-MAP') && this.sequenceMode_) {
       // https://bit.ly/2K92l7y
       // The 'X-TIMESTAMP-MAP' header is used in HLS to align text with
       // the rest of the media.
@@ -87,8 +111,6 @@ shaka.text.VttTextParser = class {
           mpegTime += shaka.text.VttTextParser.TS_ROLLOVER_;
         }
 
-        // Apple-encoded HLS content uses absolute timestamps, so assume the
-        // presence of the map tag means the content uses absolute timestamps.
         offset = time.periodStart + mpegTime / mpegTimescale - cueTime;
       }
     }

package/lib/text/web_vtt_generator.js

@@ -6,7 +6,6 @@
 
 goog.provide('shaka.text.WebVttGenerator');
 
-goog.require('shaka.Deprecate');
 goog.require('shaka.text.Cue');
 
 
@@ -49,12 +48,7 @@ shaka.text.WebVttGenerator = class {
         return `${acc}</${tag}>`;
       }, '');
 
-      if (cue.lineBreak || cue.spacer) {
-        if (cue.spacer) {
-          shaka.Deprecate.deprecateFeature(4,
-              'shaka.text.Cue',
-              'Please use lineBreak instead of spacer.');
-        }
+      if (cue.lineBreak) {
         // This is a vertical lineBreak, so insert a newline.
         return '\n';
       } else if (cue.nestedCues.length) {

package/lib/util/error.js

@@ -588,13 +588,7 @@ shaka.util.Error.Code = {
 
   // RETIRED: 'HLS_COULD_NOT_GUESS_MIME_TYPE': 4021,
 
-  /**
-   * No Master Playlist has been provided. Master playlist provides
-   * vital information about the streams (like codecs) that is
-   * required for MediaSource. We don't support directly providing
-   * a Media Playlist.
-   */
-  'HLS_MASTER_PLAYLIST_NOT_PROVIDED': 4022,
+  // RETIRED: 'HLS_MASTER_PLAYLIST_NOT_PROVIDED': 4022,
 
   /**
    * One of the required attributes was not provided, so the
@@ -634,12 +628,7 @@ shaka.util.Error.Code = {
 
   // RETIRED: 'HLS_LIVE_CONTENT_NOT_SUPPORTED': 4029,
 
-  /**
-   * The HLS parser was unable to parse segment start time from the media.
-   * <br> error.data[0] is the failed media playlist URI.
-   * <br> error.data[1] is the failed media segment URI (if any).
-   */
-  'HLS_COULD_NOT_PARSE_SEGMENT_START_TIME': 4030,
+  // RETIRED: 'HLS_COULD_NOT_PARSE_SEGMENT_START_TIME': 4030,
 
   // RETIRED: 'HLS_MEDIA_SEQUENCE_REQUIRED_IN_LIVE_STREAMS': 4031,
 
@@ -693,6 +682,13 @@ shaka.util.Error.Code = {
    */
   'HLS_VARIABLE_NOT_FOUND': 4039,
 
+  /**
+   * We do not support playing encrypted mp2t with MSE
+   */
+  'HLS_MSE_ENCRYPTED_MP2T_NOT_SUPPORTED': 4040,
+
+  // RETIRED: 'HLS_MSE_ENCRYPTED_LEGACY_APPLE_MEDIA_KEYS_NOT_SUPPORTED': 4041,
+
 
   // RETIRED: 'INCONSISTENT_BUFFER_STATE': 5000,
   // RETIRED: 'INVALID_SEGMENT_INDEX': 5001,

package/lib/util/fairplay_utils.js

@@ -8,9 +8,11 @@ goog.provide('shaka.util.FairPlayUtils');
 
 goog.require('goog.Uri');
 goog.require('goog.asserts');
+goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.BufferUtils');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.StringUtils');
+goog.require('shaka.util.Uint8ArrayUtils');
 
 
 /**
@@ -18,6 +20,29 @@ goog.require('shaka.util.StringUtils');
  * @export
  */
 shaka.util.FairPlayUtils = class {
+  /**
+   * Check if FairPlay is supported.
+   *
+   * @return {!Promise.<boolean>}
+   * @export
+   */
+  static async isFairPlaySupported() {
+    const config = {
+      initDataTypes: ['cenc', 'sinf', 'skd'],
+      videoCapabilities: [
+        {
+          contentType: 'video/mp4; codecs="avc1.42E01E"',
+        },
+      ],
+    };
+    try {
+      await navigator.requestMediaKeySystemAccess('com.apple.fps', [config]);
+      return true;
+    } catch (err) {
+      return false;
+    }
+  }
+
   /**
    * Using the default method, extract a content ID from the init data.  This is
    * based on the FairPlay example documentation.
@@ -106,4 +131,88 @@ shaka.util.FairPlayUtils = class {
         offset == rebuiltInitData.length, 'Inconsistent init data length');
     return rebuiltInitData;
   }
+
+  /**
+   * SPC FairPlay request.
+   *
+   * @param {shaka.net.NetworkingEngine.RequestType} type
+   * @param {shaka.extern.Request} request
+   * @export
+   */
+  static spcFairPlayRequest(type, request) {
+    if (type !== shaka.net.NetworkingEngine.RequestType.LICENSE) {
+      return;
+    }
+    const body = /** @type {!(ArrayBuffer|ArrayBufferView)} */(request.body);
+    const originalPayload = shaka.util.BufferUtils.toUint8(body);
+    const base64Payload = shaka.util.Uint8ArrayUtils.toBase64(originalPayload);
+    request.headers['Content-Type'] = 'application/x-www-form-urlencoded';
+    request.body = shaka.util.StringUtils.toUTF8('spc=' + base64Payload);
+  }
+
+  /**
+   * Common FairPlay response transform for some DRMs providers.
+   *
+   * @param {shaka.net.NetworkingEngine.RequestType} type
+   * @param {shaka.extern.Response} response
+   * @export
+   */
+  static commonFairPlayResponse(type, response) {
+    if (type !== shaka.net.NetworkingEngine.RequestType.LICENSE) {
+      return;
+    }
+
+    // In Apple's docs, responses can be of the form:
+    //   '\n<ckc>base64encoded</ckc>\n' or 'base64encoded'
+    // We have also seen responses in JSON format from some of our partners.
+    // In all of these text-based formats, the CKC data is base64-encoded.
+
+    let responseText;
+    try {
+      // Convert it to text for further processing.
+      responseText = shaka.util.StringUtils.fromUTF8(response.data);
+    } catch (error) {
+      // Assume it's not a text format of any kind and leave it alone.
+      return;
+    }
+
+    let licenseProcessing = false;
+
+    // Trim whitespace.
+    responseText = responseText.trim();
+
+    // Look for <ckc> wrapper and remove it.
+    if (responseText.substr(0, 5) === '<ckc>' &&
+        responseText.substr(-6) === '</ckc>') {
+      responseText = responseText.slice(5, -6);
+      licenseProcessing = true;
+    }
+
+    // Look for a JSON wrapper and remove it.
+    try {
+      const responseObject = /** @type {!Object} */(JSON.parse(responseText));
+      if (responseObject['ckc']) {
+        responseText = responseObject['ckc'];
+        licenseProcessing = true;
+      }
+      if (responseObject['CkcMessage']) {
+        responseText = responseObject['CkcMessage'];
+        licenseProcessing = true;
+      }
+      if (responseObject['License']) {
+        responseText = responseObject['License'];
+        licenseProcessing = true;
+      }
+    } catch (err) {
+      // It wasn't JSON.  Fall through with other transformations.
+    }
+
+    if (licenseProcessing) {
+      // Decode the base64-encoded data into the format the browser expects.
+      // It's not clear why FairPlay license servers don't just serve this
+      // directly.
+      response.data = shaka.util.BufferUtils.toArrayBuffer(
+          shaka.util.Uint8ArrayUtils.fromBase64(responseText));
+    }
+  }
 };

package/lib/util/functional.js

@@ -6,9 +6,6 @@
 
 goog.provide('shaka.util.Functional');
 
-goog.require('shaka.Deprecate');
-
-
 /**
  * @summary A set of functional utility functions.
  */
@@ -70,43 +67,4 @@ shaka.util.Functional = class {
   static isNotNull(value) {
     return value != null;
   }
-
-  /**
-   * Calls a factory function while allowing it to be a constructor for
-   * reverse-compatibility.
-   *
-   * @param {function():!T} factory
-   * @return {!T}
-   * @template T
-   */
-  static callFactory(factory) {
-    // See https://stackoverflow.com/q/10428603/1208502
-    // eslint-disable-next-line no-restricted-syntax
-    const obj = Object.create(factory.prototype || Object.prototype);
-    // If this is a constructor, call it with our newly created object to
-    // initialize it; if this isn't a constructor, the "this" shouldn't be used
-    // since it should be "undefined".
-    let ret;
-    try {
-      ret = factory.call(obj);  // eslint-disable-line no-restricted-syntax
-
-      // If it didn't return anything, assume it is a constructor and return our
-      // "this" value instead.
-      if (!ret) {
-        shaka.Deprecate.deprecateFeature(4,
-            'Factories requiring new',
-            'Factories should be plain functions');
-        ret = obj;
-      }
-    } catch (e) {
-      // This was an ES6 class, so it threw a TypeError because we didn't use
-      // "new".  Fall back to actually using "new".
-      shaka.Deprecate.deprecateFeature(4,
-          'Factories requiring new',
-          'Factories should be plain functions');
-      const FactoryAsClass = /** @type {function(new: T)} */(factory);
-      ret = new FactoryAsClass();
-    }
-    return ret;
-  }
 };

package/lib/util/mime_utils.js

@@ -8,9 +8,11 @@ goog.provide('shaka.util.MimeUtils');
 
 goog.require('shaka.dependencies');
 goog.require('shaka.media.Transmuxer');
+goog.require('shaka.util.ManifestParserUtils');
 
 /**
  * @summary A set of utility functions for dealing with MIME types.
+ * @export
  */
 shaka.util.MimeUtils = class {
   /**
@@ -20,6 +22,7 @@ shaka.util.MimeUtils = class {
    * @param {string} mimeType
    * @param {string=} codecs
    * @return {string}
+   * @export
    */
   static getFullType(mimeType, codecs) {
     let fullMimeType = mimeType;
@@ -32,6 +35,8 @@ shaka.util.MimeUtils = class {
   /**
    * Takes a MIME type and a codecs string and produces the full MIME
    * type. If it's a transport stream, convert its codecs to MP4 codecs.
+   * Otherwise for multiplexed content, convert the video MIME types to
+   * their audio equivalents if the content type is audio.
    *
    * @param {string} mimeType
    * @param {string} codecs
@@ -40,13 +45,19 @@ shaka.util.MimeUtils = class {
    */
   static getFullOrConvertedType(mimeType, codecs, contentType) {
     const fullMimeType = shaka.util.MimeUtils.getFullType(mimeType, codecs);
+    const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
-    if (!shaka.dependencies.muxjs() ||
-        !shaka.media.Transmuxer.isTsContainer(fullMimeType)) {
-      return fullMimeType;
+    if (shaka.media.Transmuxer.isTsContainer(fullMimeType)) {
+      if (shaka.dependencies.muxjs()) {
+        return shaka.media.Transmuxer.convertTsCodecs(
+            contentType, fullMimeType);
+      }
+    } else if (contentType == ContentType.AUDIO) {
+      // video/mp2t is the correct mime type for TS audio, so only replace the
+      // word "video" with "audio" for non-TS audio content.
+      return fullMimeType.replace('video', 'audio');
     }
-
-    return shaka.media.Transmuxer.convertTsCodecs(contentType, fullMimeType);
+    return fullMimeType;
   }
 
 

package/lib/util/platform.js

@@ -142,6 +142,18 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('Web0S');
   }
 
+  /**
+   * Check if the current platform is a WebOS 3.
+   *
+   * @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');
+  }
+
   /**
    * Check if the current platform is a Google Chromecast.
    *
@@ -151,6 +163,16 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('CrKey');
   }
 
+  /**
+   * Check if the current platform is a Android-based Cast devices.
+   *
+   * @return {boolean}
+   */
+  static isAndroidCastDevice() {
+    return shaka.util.Platform.isChromecast() &&
+        shaka.util.Platform.userAgentContains_('Android');
+  }
+
   /**
    * Check if the current platform is Google Chrome.
    *
@@ -228,6 +250,16 @@ shaka.util.Platform = class {
     return null;
   }
 
+  /**
+   * Check if the current platform is Apple Safari
+   * or Safari-based iOS browsers.
+   *
+   * @return {boolean}
+   */
+  static isSafari() {
+    return !!shaka.util.Platform.safariVersion();
+  }
+
   /**
    * Guesses if the platform is a mobile one (iOS or Android).
    *
@@ -318,6 +350,19 @@ shaka.util.Platform = class {
     const Platform = shaka.util.Platform;
     return Platform.isTizen() || Platform.isXboxOne();
   }
+
+  /**
+   * Returns true if MediaKeys is polyfilled
+   *
+   * @return {boolean}
+   */
+  static isMediaKeysPolyfilled() {
+    if (window.shakaMediaKeysPolyfill) {
+      return true;
+    }
+
+    return false;
+  }
 };
 
 /** @private {shaka.util.Timer} */

package/lib/util/player_configuration.js

@@ -9,7 +9,6 @@ goog.provide('shaka.util.PlayerConfiguration');
 goog.require('goog.asserts');
 goog.require('shaka.abr.SimpleAbrManager');
 goog.require('shaka.log');
-goog.require('shaka.media.DrmEngine');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.ConfigUtils');
 goog.require('shaka.util.LanguageUtils');
@@ -22,7 +21,10 @@ goog.require('shaka.util.Platform');
  * @export
  */
 shaka.util.PlayerConfiguration = class {
-  /** @return {shaka.extern.PlayerConfiguration} */
+  /**
+   * @return {shaka.extern.PlayerConfiguration}
+   * @export
+   */
   static createDefault() {
     // This is a relatively safe default in the absence of clues from the
     // browser.  For slower connections, the default estimate may be too high.
@@ -64,7 +66,11 @@ shaka.util.PlayerConfiguration = class {
       clearKeys: {},  // key is arbitrary key system ID, value must be string
       advanced: {},    // key is arbitrary key system ID, value is a record type
       delayLicenseRequestUntilPlayed: false,
-      initDataTransform: shaka.media.DrmEngine.defaultInitDataTransform,
+      initDataTransform: (initData, initDataType, drmInfo) => {
+        return shaka.util.ConfigUtils.referenceParametersAndReturn(
+            [initData, initDataType, drmInfo],
+            initData);
+      },
       logLicenseExchange: false,
       updateExpirationTime: 1,
       preferredKeySystems: [],
@@ -78,6 +84,7 @@ shaka.util.PlayerConfiguration = class {
       disableText: false,
       disableThumbnails: false,
       defaultPresentationDelay: 0,
+      segmentRelativeVttTiming: false,
       dash: {
         clockSyncUri: '',
         ignoreDrmInfo: false,
@@ -92,6 +99,8 @@ shaka.util.PlayerConfiguration = class {
         keySystemsByURI: {
           'urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b':
             'org.w3.clearkey',
+          'urn:uuid:e2719d58-a985-b3c9-781a-b030af78d30e':
+            'org.w3.clearkey',
           'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed':
             'com.widevine.alpha',
           'urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95':
@@ -110,9 +119,11 @@ shaka.util.PlayerConfiguration = class {
       hls: {
         ignoreTextStreamFailures: false,
         ignoreImageStreamFailures: false,
-        useFullSegmentsForStartTime: false,
         defaultAudioCodec: 'mp4a.40.2',
         defaultVideoCodec: 'avc1.42E01E',
+        ignoreManifestProgramDateTime: false,
+        mediaPlaylistFullMimeType:
+            'video/mp2t; codecs="avc1.42E01E, mp4a.40.2"',
       },
     };
 
@@ -136,8 +147,6 @@ shaka.util.PlayerConfiguration = class {
       alwaysStreamText: false,
       startAtSegmentBoundary: false,
       gapDetectionThreshold: 0.1,
-      smallGapLimit: 0.5,
-      jumpLargeGaps: false,
       durationBackoff: 1,
       forceTransmuxTS: false,
       // Offset by 5 seconds since Chromecast takes a few seconds to start
@@ -213,6 +222,8 @@ shaka.util.PlayerConfiguration = class {
       // unexpected behaviours when someone tries to plays downloaded content
       // without a persistent license.
       usePersistentLicense: true,
+
+      numberOfParallelDownloads: 5,
     };
 
     const abr = {

package/lib/util/pssh.js

@@ -90,16 +90,21 @@ shaka.util.Pssh = class {
   }
 
   /**
-   * Creates a pssh blob from the given system ID and data.
+   * Creates a pssh blob from the given system ID, data, keyIds and version.
    *
    * @param {!Uint8Array} data
    * @param {!Uint8Array} systemId
+   * @param {!Set.<string>} keyIds
+   * @param {number} version
    * @return {!Uint8Array}
    */
-  static createPssh(data, systemId) {
+  static createPssh(data, systemId, keyIds, version) {
     goog.asserts.assert(systemId.byteLength == 16, 'Invalid system ID length');
     const dataLength = data.length;
-    const psshSize = 0x4 + 0x4 + 0x4 + systemId.length + 0x4 + dataLength;
+    let psshSize = 0x4 + 0x4 + 0x4 + systemId.length + 0x4 + dataLength;
+    if (version > 0) {
+      psshSize += 0x4 + (16 * keyIds.size);
+    }
 
     /** @type {!Uint8Array} */
     const psshBox = new Uint8Array(psshSize);
@@ -111,10 +116,24 @@ shaka.util.Pssh = class {
     byteCursor += 0x4;
     psshData.setUint32(byteCursor, 0x70737368);  // 'pssh'
     byteCursor += 0x4;
-    psshData.setUint32(byteCursor, 0);  // flags
+    (version < 1) ? psshData.setUint32(byteCursor, 0) :
+        psshData.setUint32(byteCursor, 0x01000000); // version + flags
     byteCursor += 0x4;
     psshBox.set(systemId, byteCursor);
     byteCursor += systemId.length;
+
+    // if version > 0, add KID count and kid values.
+    if (version > 0) {
+      psshData.setUint32(byteCursor, keyIds.size); // KID_count
+      byteCursor += 0x4;
+      const Uint8ArrayUtils = shaka.util.Uint8ArrayUtils;
+      for (const keyId of keyIds) {
+        const KID = Uint8ArrayUtils.fromHex(keyId);
+        psshBox.set(KID, byteCursor);
+        byteCursor += KID.length;
+      }
+    }
+
     psshData.setUint32(byteCursor, dataLength);
     byteCursor += 0x4;
     psshBox.set(data, byteCursor);