shaka-player 4.7.11 → 4.7.13

package/externs/shaka/manifest.js

@@ -400,7 +400,8 @@ shaka.extern.FetchCryptoKeysFunction;
  *      undefined),
  *   mssPrivateData: (shaka.extern.MssPrivateData|undefined),
  *   external: boolean,
- *   fastSwitching: boolean
+ *   fastSwitching: boolean,
+ *   fullMimeTypes: !Set.<string>
  * }}
  *
  * @description
@@ -430,10 +431,14 @@ shaka.extern.FetchCryptoKeysFunction;
  * @property {string} mimeType
  *   <i>Required.</i> <br>
  *   The Stream's MIME type, e.g., 'audio/mp4', 'video/webm', or 'text/vtt'.
+ *   In the case of a stream that adapts between different periods with
+ *   different MIME types, this represents only the first period.
  * @property {string} codecs
  *   <i>Defaults to '' (i.e., unknown / not needed).</i> <br>
  *   The Stream's codecs, e.g., 'avc1.4d4015' or 'vp9', which must be
  *   compatible with the Stream's MIME type. <br>
+ *   In the case of a stream that adapts between different periods with
+ *   different codecs, this represents only the first period.
  *   See {@link https://tools.ietf.org/html/rfc6381}
  * @property {(number|undefined)} frameRate
  *   <i>Video streams only.</i> <br>
@@ -535,6 +540,11 @@ shaka.extern.FetchCryptoKeysFunction;
  *   Eg: external text tracks.
  * @property {boolean} fastSwitching
  *   Indicate if the stream should be used for fast switching.
+ * @property {!Set.<string>} fullMimeTypes
+ *   A set of full MIME types (e.g. MIME types plus codecs information), that
+ *   represents the types used in each period of the original manifest.
+ *   Meant for being used by compatibility checking, such as with
+ *   MediaSource.isTypeSupported.
  *
  * @exportDoc
  */

package/externs/shaka/offline.js

@@ -230,7 +230,9 @@ shaka.extern.StreamDB;
  *   tilesLayout: ?string,
  *   pendingSegmentRefId: (string|undefined),
  *   pendingInitSegmentRefId: (string|undefined),
- *   dataKey: number
+ *   dataKey: number,
+ *   mimeType: ?string,
+ *   codecs: ?string
  * }}
  *
  * @property {?number} initSegmentKey
@@ -263,6 +265,10 @@ shaka.extern.StreamDB;
  *   downloaded.
  * @property {number} dataKey
  *   The key to the data in storage.
+ * @property {?string} mimeType
+ *   The mimeType of the segment.
+ * @property {?string} codecs
+ *   The codecs of the segment.
  */
 shaka.extern.SegmentDB;
 

package/externs/shaka/player.js

@@ -96,57 +96,70 @@ shaka.extern.StateChange;
  * again.
  *
  * @property {number} width
- *   The width of the current video track.
+ *   The width of the current video track. If nothing is loaded or the content
+ *   is audio-only, NaN.
  * @property {number} height
- *   The height of the current video track.
+ *   The height of the current video track. If nothing is loaded or the content
+ *   is audio-only, NaN.
  * @property {number} streamBandwidth
  *   The bandwidth required for the current streams (total, in bit/sec).
- *   It takes into account the playbackrate.
+ *   It takes into account the playbackrate. If nothing is loaded, NaN.
  *
  * @property {number} decodedFrames
- *   The total number of frames decoded by the Player.  This may be
- *   <code>NaN</code> if this is not supported by the browser.
+ *   The total number of frames decoded by the Player. If not reported by the
+ *   browser, NaN.
  * @property {number} droppedFrames
- *   The total number of frames dropped by the Player.  This may be
- *   <code>NaN</code> if this is not supported by the browser.
+ *   The total number of frames dropped by the Player. If not reported by the
+ *   browser, NaN.
  * @property {number} corruptedFrames
- *   The total number of corrupted frames dropped by the browser.  This may be
- *   <code>NaN</code> if this is not supported by the browser.
+ *   The total number of corrupted frames dropped by the browser. If not
+ *   reported by the browser, NaN.
  * @property {number} estimatedBandwidth
- *   The current estimated network bandwidth (in bit/sec).
+ *   The current estimated network bandwidth (in bit/sec). If no estimate
+ *   available, NaN.
  *
  * @property {number} gapsJumped
  *   The total number of playback gaps jumped by the GapJumpingController.
+ *   If nothing is loaded, NaN.
  * @property {number} stallsDetected
  *   The total number of playback stalls detected by the StallDetector.
+ *   If nothing is loaded, NaN.
  *
  * @property {number} completionPercent
  *   This is the greatest completion percent that the user has experienced in
- *   playback.  Also known as the "high water mark".  Is NaN when there is no
- *   known duration, such as for livestreams.
+ *   playback. Also known as the "high water mark". If nothing is loaded, or
+ *   the stream is live (and therefore indefinite), NaN.
  * @property {number} loadLatency
  *   This is the number of seconds it took for the video element to have enough
  *   data to begin playback.  This is measured from the time load() is called to
  *   the time the <code>'loadeddata'</code> event is fired by the media element.
+ *   If nothing is loaded, NaN.
  * @property {number} manifestTimeSeconds
  *   The amount of time it took to download and parse the manifest.
+ *   If nothing is loaded, NaN.
  * @property {number} drmTimeSeconds
  *   The amount of time it took to download the first drm key, and load that key
- *   into the drm system.
+ *   into the drm system. If nothing is loaded or DRM is not in use, NaN.
  * @property {number} playTime
- *   The total time spent in a playing state in seconds.
+ *   The total time spent in a playing state in seconds. If nothing is loaded,
+ *   NaN.
  * @property {number} pauseTime
- *   The total time spent in a paused state in seconds.
+ *   The total time spent in a paused state in seconds. If nothing is loaded,
+ *   NaN.
  * @property {number} bufferingTime
- *   The total time spent in a buffering state in seconds.
+ *   The total time spent in a buffering state in seconds. If nothing is
+ *   loaded, NaN.
  * @property {number} licenseTime
- *   The time spent on license requests during this session in seconds, or NaN.
+ *   The time spent on license requests during this session in seconds. If DRM
+ *   is not in use, NaN.
  * @property {number} liveLatency
  *   The time between the capturing of a frame and the end user having it
- *   displayed on their screen.
+ *   displayed on their screen. If nothing is loaded or the content is VOD,
+ *   NaN.
  *
  * @property {number} maxSegmentDuration
- *   The presentation's max segment duration in seconds, or NaN.
+ *   The presentation's max segment duration in seconds. If nothing is loaded,
+ *   NaN.
  *
  * @property {!Array.<shaka.extern.TrackChoice>} switchHistory
  *   A history of the stream changes.

package/lib/abr/simple_abr_manager.js

@@ -6,10 +6,11 @@
 
 goog.provide('shaka.abr.SimpleAbrManager');
 
-goog.require('shaka.util.IReleasable');
 goog.require('goog.asserts');
 goog.require('shaka.abr.EwmaBandwidthEstimator');
 goog.require('shaka.log');
+goog.require('shaka.util.EventManager');
+goog.require('shaka.util.IReleasable');
 goog.require('shaka.util.StreamUtils');
 goog.require('shaka.util.Timer');
 
@@ -50,30 +51,30 @@ shaka.abr.SimpleAbrManager = class {
     /** @private {shaka.abr.EwmaBandwidthEstimator} */
     this.bandwidthEstimator_ = new shaka.abr.EwmaBandwidthEstimator();
 
-    /** @private {?function():void} */
-    this.onNetworkInformationChange_ = null;
+    /** @private {!shaka.util.EventManager} */
+    this.eventManager_ = new shaka.util.EventManager();
 
     // Some browsers implement the Network Information API, which allows
     // retrieving information about a user's network connection. We listen
     // to the change event to be able to make quick changes in case the type
     // of connectivity changes.
     if (navigator.connection && navigator.connection.addEventListener) {
-      this.onNetworkInformationChange_ = () => {
-        if (this.enabled_ && this.config_.useNetworkInformation) {
-          this.bandwidthEstimator_ = new shaka.abr.EwmaBandwidthEstimator();
-          if (this.config_) {
-            this.bandwidthEstimator_.configure(this.config_.advanced);
-          }
-          const chosenVariant = this.chooseVariant();
-          if (chosenVariant && navigator.onLine) {
-            this.switch_(chosenVariant, this.config_.clearBufferSwitch,
-                this.config_.safeMarginSwitch);
-          }
-        }
-      };
-
-      navigator.connection.addEventListener(
-          'change', this.onNetworkInformationChange_);
+      this.eventManager_.listen(
+          /** @type {EventTarget} */(navigator.connection),
+          'change',
+          () => {
+            if (this.enabled_ && this.config_.useNetworkInformation) {
+              this.bandwidthEstimator_ = new shaka.abr.EwmaBandwidthEstimator();
+              if (this.config_) {
+                this.bandwidthEstimator_.configure(this.config_.advanced);
+              }
+              const chosenVariant = this.chooseVariant();
+              if (chosenVariant && navigator.onLine) {
+                this.switch_(chosenVariant, this.config_.clearBufferSwitch,
+                    this.config_.safeMarginSwitch);
+              }
+            }
+          });
     }
 
     /**
@@ -151,13 +152,7 @@ shaka.abr.SimpleAbrManager = class {
    */
   release() {
     // stop() should already have been called for unload
-
-    if (navigator.connection && navigator.connection.removeEventListener) {
-      navigator.connection.removeEventListener(
-          'change', this.onNetworkInformationChange_);
-      this.onNetworkInformationChange_ = null;
-    }
-
+    this.eventManager_.release();
     this.resizeObserverTimer_ = null;
   }
 

package/lib/cast/cast_proxy.js

@@ -188,12 +188,10 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @export
    */
   async cast() {
-    const initState = this.getInitState_();
-
     // TODO: transfer manually-selected tracks?
     // TODO: transfer side-loaded text tracks?
 
-    await this.sender_.cast(initState);
+    await this.sender_.cast();
     if (!this.localPlayer_) {
       // We've already been destroyed.
       return;

package/lib/cast/cast_sender.js

@@ -261,12 +261,10 @@ shaka.cast.CastSender = class {
 
 
   /**
-   * @param {shaka.cast.CastUtils.InitStateType} initState Video and player
-   *   state to be sent to the receiver.
    * @return {!Promise} Resolved when connected to a receiver.  Rejected if the
    *   connection fails or is canceled by the user.
    */
-  async cast(initState) {
+  async cast() {
     if (!this.apiReady_) {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.RECOVERABLE,
@@ -288,7 +286,7 @@ shaka.cast.CastSender = class {
 
     this.castPromise_ = new shaka.util.PublicPromise();
     chrome.cast.requestSession(
-        (session) => this.onSessionInitiated_(initState, session),
+        (session) => this.onSessionInitiated_(session),
         (error) => this.onConnectionError_(error));
     await this.castPromise_;
   }
@@ -303,10 +301,9 @@ shaka.cast.CastSender = class {
     if (!this.isCasting_) {
       return;
     }
-    const initState = this.onInitStateRequired_();
 
     chrome.cast.requestSession(
-        (session) => this.onSessionInitiated_(initState, session),
+        (session) => this.onSessionInitiated_(session),
         (error) => this.onConnectionError_(error));
   }
 
@@ -401,12 +398,14 @@ shaka.cast.CastSender = class {
 
 
   /**
-   * @param {shaka.cast.CastUtils.InitStateType} initState
    * @param {chrome.cast.Session} session
    * @private
    */
-  onSessionInitiated_(initState, session) {
+  onSessionInitiated_(session) {
     shaka.log.debug('CastSender: onSessionInitiated');
+
+    const initState = this.onInitStateRequired_();
+
     this.onSessionCreated_(session);
 
     this.sendMessage_({
@@ -529,12 +528,10 @@ shaka.cast.CastSender = class {
   onExistingSessionJoined_(session) {
     shaka.log.debug('CastSender: onExistingSessionJoined');
 
-    const initState = this.onInitStateRequired_();
-
     this.castPromise_ = new shaka.util.PublicPromise();
     this.hasJoinedExistingSession_ = true;
 
-    this.onSessionInitiated_(initState, session);
+    this.onSessionInitiated_(session);
   }
 
 

package/lib/cea/cea608_memory.js

@@ -293,7 +293,7 @@ shaka.cea.Cea608Memory.CharSet.BasicNorthAmericanChars = new Map([
  */
 shaka.cea.Cea608Memory.CharSet.SpecialNorthAmericanChars = new Map([
   [0x30, '®'], [0x31, '°'], [0x32, '½'], [0x33, '¿'], [0x34, '™'], [0x35, '¢'],
-  [0x36, '£'], [0x37, '♪'], [0x38, 'à'], [0x39, '⠀'], [0x3a, 'è'], [0x3b, 'â'],
+  [0x36, '£'], [0x37, '♪'], [0x38, 'à'], [0x39, ' '], [0x3a, 'è'], [0x3b, 'â'],
   [0x3c, 'ê'], [0x3d, 'î'], [0x3e, 'ô'], [0x3f, 'û'],
 ]);
 

package/lib/cea/ts_cea_parser.js

@@ -26,6 +26,9 @@ shaka.cea.TsCeaParser = class {
      * @const {!shaka.cea.SeiProcessor}
      */
     this.seiProcessor_ = new shaka.cea.SeiProcessor();
+
+    /** @private {?shaka.util.TsParser} */
+    this.tsParser_ = null;
   }
 
   /**
@@ -41,6 +44,12 @@ shaka.cea.TsCeaParser = class {
   parse(mediaSegment) {
     const CeaUtils = shaka.cea.CeaUtils;
 
+    if (!this.tsParser_) {
+      this.tsParser_ = new shaka.util.TsParser();
+    } else {
+      this.tsParser_.clearData();
+    }
+
     /** @type {!Array<!shaka.extern.ICeaParser.CaptionPacket>} **/
     const captionPackets = [];
 
@@ -48,7 +57,7 @@ shaka.cea.TsCeaParser = class {
     if (!shaka.util.TsParser.probe(uint8ArrayData)) {
       return captionPackets;
     }
-    const tsParser = new shaka.util.TsParser().parse(uint8ArrayData);
+    const tsParser = this.tsParser_.parse(uint8ArrayData);
     const codecs = tsParser.getCodecs();
     const videoNalus = tsParser.getVideoNalus();
     const validNaluTypes = [];

package/lib/dash/dash_parser.js

@@ -643,6 +643,9 @@ shaka.dash.DashParser = class {
     // best latency
     if (this.lowLatencyMode_) {
       minBufferTime = 0;
+      const presentationDelay = suggestedPresentationDelay != null ?
+          suggestedPresentationDelay : this.config_.defaultPresentationDelay;
+      presentationTimeline.setDelay(presentationDelay);
     }
 
     // These steps are not done on manifest update.
@@ -1482,8 +1485,13 @@ shaka.dash.DashParser = class {
         const getBaseUris = context.representation.getBaseUris;
         streamInfo = {
           generateSegmentIndex: () => {
-            return Promise.resolve(shaka.media.SegmentIndex.forSingleSegment(
-                periodStart, duration, getBaseUris()));
+            const segmentIndex = shaka.media.SegmentIndex.forSingleSegment(
+                periodStart, duration, getBaseUris());
+            segmentIndex.forEachTopLevelReference((ref) => {
+              ref.mimeType = context.representation.mimeType;
+              ref.codecs = context.representation.codecs;
+            });
+            return Promise.resolve(segmentIndex);
           },
         };
       }
@@ -1582,7 +1590,7 @@ shaka.dash.DashParser = class {
         },
         segmentIndex: null,
         mimeType: context.representation.mimeType,
-        codecs: context.representation.codecs,
+        codecs,
         frameRate: context.representation.frameRate,
         pixelAspectRatio: context.representation.pixelAspectRatio,
         bandwidth: context.bandwidth,
@@ -1612,6 +1620,8 @@ shaka.dash.DashParser = class {
         accessibilityPurpose,
         external: false,
         fastSwitching: false,
+        fullMimeTypes: new Set([shaka.util.MimeUtils.getFullType(
+            context.representation.mimeType, context.representation.codecs)]),
       };
     }
 

package/lib/dash/segment_base.js

@@ -62,7 +62,7 @@ shaka.dash.SegmentBase = class {
 
     const getUris = () => resolvedUris;
     const qualityInfo = shaka.dash.SegmentBase.createQualityInfo(context);
-    return new shaka.media.InitSegmentReference(
+    const ref = new shaka.media.InitSegmentReference(
         getUris,
         startByte,
         endByte,
@@ -70,6 +70,9 @@ shaka.dash.SegmentBase = class {
         /* timescale= */ null,
         /* segmentData= */ null,
         aes128Key);
+    ref.codecs = context.representation.codecs;
+    ref.mimeType = context.representation.mimeType;
+    return ref;
   }
 
   /**
@@ -184,6 +187,10 @@ shaka.dash.SegmentBase = class {
           indexData, initData, uris, initSegmentReference, timestampOffset,
           appendWindowStart, appendWindowEnd);
     }
+    for (const ref of references) {
+      ref.codecs = context.representation.codecs;
+      ref.mimeType = context.representation.mimeType;
+    }
 
     presentationTimeline.notifySegments(references);
 

package/lib/dash/segment_list.js

@@ -60,7 +60,8 @@ shaka.dash.SegmentList = class {
     const references = SegmentList.createSegmentReferences_(
         context.periodInfo.start, context.periodInfo.duration,
         info.startNumber, context.representation.getBaseUris, info,
-        initSegmentReference, aes128Key);
+        initSegmentReference, aes128Key, context.representation.mimeType,
+        context.representation.codecs);
 
     const isNew = !segmentIndex;
     if (segmentIndex) {
@@ -199,12 +200,14 @@ shaka.dash.SegmentList = class {
    * @param {shaka.dash.SegmentList.SegmentListInfo} info
    * @param {shaka.media.InitSegmentReference} initSegmentReference
    * @param {shaka.extern.aes128Key|undefined} aes128Key
+   * @param {string} mimeType
+   * @param {string} codecs
    * @return {!Array.<!shaka.media.SegmentReference>}
    * @private
    */
   static createSegmentReferences_(
       periodStart, periodDuration, startNumber, getBaseUris, info,
-      initSegmentReference, aes128Key) {
+      initSegmentReference, aes128Key, mimeType, codecs) {
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
 
     let max = info.mediaSegments.length;
@@ -251,22 +254,25 @@ shaka.dash.SegmentList = class {
         }
         return uris;
       };
-      references.push(
-          new shaka.media.SegmentReference(
-              periodStart + startTime,
-              periodStart + endTime,
-              getUris,
-              segment.start,
-              segment.end,
-              initSegmentReference,
-              timestampOffset,
-              appendWindowStart, appendWindowEnd,
-              /* partialReferences= */ [],
-              /* tilesLayout= */ '',
-              /* tileDuration= */ null,
-              /* syncTime= */ null,
-              shaka.media.SegmentReference.Status.AVAILABLE,
-              aes128Key));
+
+      const ref = new shaka.media.SegmentReference(
+          periodStart + startTime,
+          periodStart + endTime,
+          getUris,
+          segment.start,
+          segment.end,
+          initSegmentReference,
+          timestampOffset,
+          appendWindowStart, appendWindowEnd,
+          /* partialReferences= */ [],
+          /* tilesLayout= */ '',
+          /* tileDuration= */ null,
+          /* syncTime= */ null,
+          shaka.media.SegmentReference.Status.AVAILABLE,
+          aes128Key);
+      ref.codecs = codecs;
+      ref.mimeType = mimeType;
+      references.push(ref);
       prevEndTime = endTime;
     }
 

package/lib/dash/segment_template.js

@@ -213,6 +213,8 @@ shaka.dash.SegmentTemplate = class {
       timeline: segmentInfo.timeline,
       mediaTemplate: media,
       indexTemplate: index,
+      mimeType: context.representation.mimeType,
+      codecs: context.representation.codecs,
     };
   }
 
@@ -463,6 +465,8 @@ shaka.dash.SegmentTemplate = class {
           /* syncTime= */ null,
           shaka.media.SegmentReference.Status.AVAILABLE,
           aes128Key);
+      ref.codecs = context.representation.codecs;
+      ref.mimeType = context.representation.mimeType;
       // This is necessary information for thumbnail streams:
       ref.trueEndTime = trueSegmentEnd;
       return ref;
@@ -552,7 +556,7 @@ shaka.dash.SegmentTemplate = class {
       return resolvedUris;
     };
     const qualityInfo = shaka.dash.SegmentBase.createQualityInfo(context);
-    return new shaka.media.InitSegmentReference(
+    const ref = new shaka.media.InitSegmentReference(
         getUris,
         /* startByte= */ 0,
         /* endByte= */ null,
@@ -560,6 +564,9 @@ shaka.dash.SegmentTemplate = class {
         /* timescale= */ null,
         /* segmentData= */ null,
         aes128Key);
+    ref.codecs = context.representation.codecs;
+    ref.mimeType = context.representation.mimeType;
+    return ref;
   }
 };
 
@@ -835,6 +842,8 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
           this.periodEnd_ !== Infinity) {
         segmentEnd = this.periodEnd_;
       }
+      const codecs = this.templateInfo_.codecs;
+      const mimeType = this.templateInfo_.mimeType;
 
       const partialSegmentRefs = [];
 
@@ -877,6 +886,8 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
             /* syncTime= */ null,
             shaka.media.SegmentReference.Status.AVAILABLE,
             this.aes128Key_);
+        partial.codecs = codecs;
+        partial.mimeType = mimeType;
         if (this.segmentSequenceCadence_ == 0) {
           if (i > 0) {
             partial.markAsNonIndependent();
@@ -920,6 +931,8 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
           shaka.media.SegmentReference.Status.AVAILABLE,
           this.aes128Key_,
           /* allPartialSegments= */ range.partialSegments > 0);
+      ref.codecs = codecs;
+      ref.mimeType = mimeType;
       ref.trueEndTime = trueSegmentEnd;
       this.references[correctedPosition] = ref;
     }
@@ -955,7 +968,9 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
  *   unscaledPresentationTimeOffset: number,
  *   timeline: Array.<shaka.media.PresentationTimeline.TimeRange>,
  *   mediaTemplate: ?string,
- *   indexTemplate: ?string
+ *   indexTemplate: ?string,
+ *   mimeType: string,
+ *   codecs: string
  * }}
  *
  * @description
@@ -977,5 +992,9 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
  *   The media URI template, if given.
  * @property {?string} indexTemplate
  *   The index URI template, if given.
+ * @property {string} mimeType
+ *   The mimeType.
+ * @property {string} codecs
+ *   The codecs.
  */
 shaka.dash.SegmentTemplate.SegmentTemplateInfo;