shaka-player 4.2.0 → 4.2.2

package/docs/jsdoc-template/publish.js

@@ -440,6 +440,7 @@ function buildNav(members) {
       [members.externals, 'Externals', seen, linktoExternal],
       [members.namespaces, 'Namespaces', seen, linkto],
       [members.classes, 'Classes', seen, linkto],
+      [members.enums, 'Enums', seen, linkto],
       [members.interfaces, 'Interfaces', seen, linkto],
       [members.events, 'Events', seen, linkto],
       [members.mixins, 'Mixins', seen, linkto],
@@ -484,6 +485,7 @@ function fixUpType(type) {
 exports.publish = (taffyData, opts, tutorials) => {
     let classes;
     let conf;
+    let enums;
     let externals;
     let files;
     let fromDir;
@@ -733,6 +735,31 @@ exports.publish = (taffyData, opts, tutorials) => {
     });
 
     members = helper.getMembers(data);
+    members.enums = [];
+
+    data().each(doclet => {
+        if (doclet.isEnum) {
+            const hasParent = !!docletMap[doclet.memberof];
+
+            // Enums without parents (not attached to a class, but directly to a
+            // namespace) aren't recognized by jsdoc by default and need to be
+            // massaged into the docs separately.
+            if (!hasParent) {
+                // Temporarily call this a "class", so that we can fix the URL.
+                doclet.kind = 'class';
+                // Regenerate the URL, so that this enum gets its own page
+                // instead of a URL that links to an ID within a non-existent
+                // parent page.
+                delete helper.longnameToUrl[doclet.longname];
+                helper.createLink(doclet);
+                // Mark this as an enum (custom type), so that it doesn't get
+                // slotted with the classes.
+                doclet.kind = 'enum';
+                members.enums.push(doclet);
+            }
+        }
+    });
+
     members.tutorials = tutorials.children;
     if (conf.default.sortTutorialsByConfigOrder) {
         members.tutorials.sort((a, b) => {
@@ -778,6 +805,7 @@ exports.publish = (taffyData, opts, tutorials) => {
 
     // set up the lists that we'll use to generate pages
     classes = taffy(members.classes);
+    enums = taffy(members.enums);
     modules = taffy(members.modules);
     namespaces = taffy(members.namespaces);
     mixins = taffy(members.mixins);
@@ -786,6 +814,7 @@ exports.publish = (taffyData, opts, tutorials) => {
 
     Object.keys(helper.longnameToUrl).forEach(longname => {
         const myClasses = helper.find(classes, {longname: longname});
+        const myEnums = helper.find(enums, {longname: longname});
         const myExternals = helper.find(externals, {longname: longname});
         const myInterfaces = helper.find(interfaces, {longname: longname});
         const myMixins = helper.find(mixins, {longname: longname});
@@ -800,6 +829,10 @@ exports.publish = (taffyData, opts, tutorials) => {
             generate(`Class: ${myClasses[0].longname}`, myClasses, helper.longnameToUrl[longname]);
         }
 
+        if (myEnums.length) {
+            generate(`Enum: ${myEnums[0].longname}`, myEnums, helper.longnameToUrl[longname]);
+        }
+
         if (myNamespaces.length) {
             generate(`Namespace: ${myNamespaces[0].longname}`, myNamespaces, helper.longnameToUrl[longname]);
         }

package/docs/jsdoc-template/tmpl/container.tmpl

@@ -144,7 +144,10 @@
                 return m.longname && m.longname.indexOf('module:') !== 0;
             });
         }
-        if (members && members.length && members.forEach) {
+
+        // Skip enums, since they already have their values listed under
+        // "Properties".
+        if (members && members.length && members.forEach && doc.kind != 'enum') {
     ?>
         <h3 class="subsection-title">Members</h3>
 

package/docs/jsdoc.conf.json

@@ -16,6 +16,7 @@
       "navOrder": [
         "Tutorials",
         "Classes",
+        "Enums",
         "Interfaces",
         "Events"
       ]

package/externs/shaka/manifest_parser.js

@@ -111,7 +111,8 @@ shaka.extern.ManifestParser = class {
  *   onError: function(!shaka.util.Error),
  *   isLowLatencyMode: function():boolean,
  *   isAutoLowLatencyMode: function():boolean,
- *   enableLowLatencyMode: function()
+ *   enableLowLatencyMode: function(),
+ *   updateDuration: function()
  * }}
  *
  * @description
@@ -147,6 +148,8 @@ shaka.extern.ManifestParser = class {
  *   Return true if auto low latency streaming mode is enabled.
  * @property {function()} enableLowLatencyMode
  *   Enable low latency streaming mode.
+ * @property {function()} updateDuration
+ *   Update the presentation duration based on PresentationTimeline.
  * @exportDoc
  */
 shaka.extern.ManifestParser.PlayerInterface;

package/externs/shaka/player.js

@@ -632,7 +632,8 @@ shaka.extern.AdvancedDrmConfiguration;
  *   logLicenseExchange: boolean,
  *   updateExpirationTime: number,
  *   preferredKeySystems: !Array.<string>,
- *   keySystemsMapping: !Object.<string, string>
+ *   keySystemsMapping: !Object.<string, string>,
+ *   parseInbandPsshEnabled: boolean
  * }}
  *
  * @property {shaka.extern.RetryParameters} retryParameters
@@ -675,6 +676,11 @@ shaka.extern.AdvancedDrmConfiguration;
  *   Specifies the priorties of available DRM key systems.
  * @property {Object.<string, string>} keySystemsMapping
  *   A map of key system name to key system name.
+ * @property {boolean} parseInbandPsshEnabled
+ *   <i>Defaults to true on Xbox One, and false for all other browsers.</i><br>
+ *   When true parse DRM init data from pssh boxes in media and init segments
+ *   and ignore 'encrypted' events.
+ *   This is required when using in-band key rotation on Xbox One.
  *
  * @exportDoc
  */

package/lib/ads/client_side_ad_manager.js

@@ -205,6 +205,13 @@ shaka.ads.ClientSideAdManager = class {
               this.video_.offsetHeight, viewMode);
         });
         this.resizeObserver_.observe(this.video_);
+      } else {
+        this.eventManager_.listen(document, 'fullscreenchange', () => {
+          const viewMode = this.isFullScreenEnabled_() ?
+              google.ima.ViewMode.FULLSCREEN : google.ima.ViewMode.NORMAL;
+          this.imaAdsManager_.resize(this.video_.offsetWidth,
+              this.video_.offsetHeight, viewMode);
+        });
       }
 
       // Single video and overlay ads will start at this time

package/lib/cast/cast_sender.js

@@ -192,21 +192,14 @@ shaka.cast.CastSender = class {
       // If the API becomes available before this instance dies, init will be
       // called again.
 
-      // A note about this value: In our testing environment, we load both
-      // uncompiled and compiled code.  This global callback in uncompiled mode
-      // can be overwritten by the same in compiled mode.  The two versions will
-      // each have their own instances_ map.  Therefore the callback must have a
-      // name, as opposed to being anonymous.  This way, the CastSender tests
-      // can invoke the named static method instead of using a global that could
-      // be overwritten.
-      if (!window.__onGCastApiAvailable) {
-        window.__onGCastApiAvailable = shaka.cast.CastSender.onSdkLoaded_;
-      }
-      if (window.__onGCastApiAvailable != shaka.cast.CastSender.onSdkLoaded_) {
-        shaka.log.alwaysWarn('A global Cast SDK hook is already installed! ' +
-          'Shaka Player will be unable to receive a notification when the ' +
-          'Cast SDK is ready.');
+      // Check if our callback is already installed.
+      if (window.__onGCastApiAvailable !== CastSender.onGCastApiAvailable_) {
+        // Save pre-existing __onGCastApiAvailable in order to restore later.
+        CastSender.__onGCastApiAvailable_ =
+          window.__onGCastApiAvailable || null;
+        window.__onGCastApiAvailable = CastSender.onGCastApiAvailable_;
       }
+
       return;
     }
 
@@ -757,6 +750,9 @@ shaka.cast.CastSender.hasReceivers_ = false;
 /** @private {chrome.cast.Session} */
 shaka.cast.CastSender.session_ = null;
 
+/** @private {?function(boolean)} */
+shaka.cast.CastSender.__onGCastApiAvailable_ = null;
+
 /**
  * A set of all living CastSender instances.  The constructor and destroy
  * methods will add and remove instances from this set.
@@ -784,3 +780,32 @@ shaka.cast.CastSender.onSdkLoaded_ = (loaded) => {
     }
   }
 };
+
+/**
+ * @param {boolean} available
+ * @private
+ */
+shaka.cast.CastSender.onGCastApiAvailable_ = (available) => {
+  // Restore callback from saved.
+  if (shaka.cast.CastSender.__onGCastApiAvailable_) {
+    window.__onGCastApiAvailable =
+      shaka.cast.CastSender.__onGCastApiAvailable_;
+  } else {
+    delete window.__onGCastApiAvailable;
+  }
+  shaka.cast.CastSender.__onGCastApiAvailable_ = null;
+
+  // A note about this value: In our testing environment, we load both
+  // uncompiled and compiled code.  This global callback in uncompiled mode
+  // can be overwritten by the same in compiled mode.  The two versions will
+  // each have their own instances_ map.  Therefore the callback must have a
+  // name, as opposed to being anonymous.  This way, the CastSender tests
+  // can invoke the named static method instead of using a global that could
+  // be overwritten.
+  shaka.cast.CastSender.onSdkLoaded_(available);
+
+  // call restored callback (if any)
+  if (typeof window.__onGCastApiAvailable === 'function') {
+    window.__onGCastApiAvailable(available);
+  }
+};

package/lib/cea/cea608_memory.js

@@ -184,6 +184,10 @@ shaka.cea.Cea608Memory = class {
    * @param {number} count Count of rows to move.
    */
   moveRows(dst, src, count) {
+    if (src < 0 || dst < 0) {
+      return;
+    }
+
     if (dst >= src) {
       for (let i = count-1; i >= 0; i--) {
         this.rows_[dst + i] = this.rows_[src + i].map((e) => e);

package/lib/hls/hls_parser.js

@@ -180,10 +180,6 @@ shaka.hls.HlsParser = class {
      */
     this.groupIdToClosedCaptionsMap_ = new Map();
 
-    /** True if some of the variants in  the playlist is encrypted with AES-128.
-     * @private {boolean} */
-    this.aesEncrypted_ = false;
-
     /** @private {Map.<string, string>} */
     this.groupIdToCodecsMap_ = new Map();
 
@@ -288,6 +284,21 @@ shaka.hls.HlsParser = class {
     }
 
     await Promise.all(updates);
+
+    this.notifySegments_();
+
+    // If any hasEndList is false, the stream is still live.
+    const stillLive = streamInfos.some((s) => s.hasEndList == false);
+    if (!stillLive) {
+      // Convert the presentation to VOD and set the duration.
+      const PresentationType = shaka.hls.HlsParser.PresentationType_;
+      this.setPresentationType_(PresentationType.VOD);
+
+      const maxTimestamps = streamInfos.map((s) => s.maxTimestamp);
+      // The duration is the minimum of the end times of all streams.
+      this.presentationTimeline_.setDuration(Math.min(...maxTimestamps));
+      this.playerInterface_.updateDuration();
+    }
   }
 
   /**
@@ -298,7 +309,6 @@ shaka.hls.HlsParser = class {
    * @private
    */
   async updateStream_(streamInfo) {
-    const PresentationType = shaka.hls.HlsParser.PresentationType_;
     const manifestUri = streamInfo.absoluteMediaPlaylistUri;
     const uriObj = new goog.Uri(manifestUri);
     if (this.lowLatencyMode_ && streamInfo.canSkipSegments) {
@@ -331,6 +341,7 @@ shaka.hls.HlsParser = class {
         streamInfo.verbatimMediaPlaylistUri, playlist, stream.type,
         stream.mimeType, streamInfo.mediaSequenceToStartTime, mediaVariables,
         stream.codecs);
+    this.segmentsToNotifyByStream_.push(segments);
 
     stream.segmentIndex.mergeAndEvict(
         segments, this.presentationTimeline_.getSegmentAvailabilityStart());
@@ -351,10 +362,10 @@ shaka.hls.HlsParser = class {
         shaka.hls.Utils.getFirstTagWithName(playlist.tags, 'EXT-X-ENDLIST');
 
     if (endListTag) {
-      // Convert the presentation to VOD and set the duration to the last
-      // segment's end time.
-      this.setPresentationType_(PresentationType.VOD);
-      this.presentationTimeline_.setDuration(newestSegment.endTime);
+      // Flag this for later.  We don't convert the whole presentation into VOD
+      // until we've seen the ENDLIST tag for all active playlists.
+      streamInfo.hasEndList = true;
+      streamInfo.maxTimestamp = newestSegment.endTime;
     }
   }
 
@@ -576,7 +587,6 @@ shaka.hls.HlsParser = class {
           playlist, uri, uri, codecs, type, language, primary, name,
           channelsCount, closedCaptions, characteristics, forced, spatialAudio,
           mimeType);
-      goog.asserts.assert(streamInfo != null, 'StreamInfo is null!');
       this.uriToStreamInfosMap_.set(uri, streamInfo);
 
       // Wrap the stream from that stream info with a variant.
@@ -654,17 +664,6 @@ shaka.hls.HlsParser = class {
       this.syncStreamsWithProgramDateTime_();
     }
 
-    if (this.aesEncrypted_ && variants.length == 0) {
-      // We do not support AES-128 encryption with HLS yet. Variants is null
-      // when the playlist is encrypted with AES-128.
-      shaka.log.info('No stream is created, because we don\'t support AES-128',
-          'encryption yet');
-      throw new shaka.util.Error(
-          shaka.util.Error.Severity.CRITICAL,
-          shaka.util.Error.Category.MANIFEST,
-          shaka.util.Error.Code.HLS_AES_128_ENCRYPTION_NOT_SUPPORTED);
-    }
-
     // Find the min and max timestamp of the earliest segment in all streams.
     // Find the minimum duration of all streams as well.
     let minDuration = Infinity;
@@ -863,8 +862,6 @@ shaka.hls.HlsParser = class {
       }
       try {
         const streamInfo = await this.createStreamInfoFromMediaTag_(tag);
-        goog.asserts.assert(
-            streamInfo, 'Should always have a streamInfo for text');
         return streamInfo.stream;
       } catch (e) {
         if (this.config_.hls.ignoreTextStreamFailures) {
@@ -907,8 +904,6 @@ shaka.hls.HlsParser = class {
       }
       try {
         const streamInfo = await this.createStreamInfoFromImageTag_(tag);
-        goog.asserts.assert(
-            streamInfo, 'Should always have a streamInfo for image');
         return streamInfo.stream;
       } catch (e) {
         if (this.config_.hls.ignoreImageStreamFailures) {
@@ -960,22 +955,17 @@ shaka.hls.HlsParser = class {
       const streamInfos = await this.createStreamInfosForVariantTag_(tag,
           resolution, frameRate);
 
-      if (streamInfos) {
-        goog.asserts.assert(streamInfos.audio.length ||
-            streamInfos.video.length, 'We should have created a stream!');
-
-        return this.createVariants_(
-            streamInfos.audio,
-            streamInfos.video,
-            bandwidth,
-            width,
-            height,
-            frameRate,
-            videoRange);
-      }
-      // We do not support AES-128 encryption with HLS yet. If the streamInfos
-      // is null because of AES-128 encryption, do not create variants for that.
-      return [];
+      goog.asserts.assert(streamInfos.audio.length ||
+          streamInfos.video.length, 'We should have created a stream!');
+
+      return this.createVariants_(
+          streamInfos.audio,
+          streamInfos.video,
+          bandwidth,
+          width,
+          height,
+          frameRate,
+          videoRange);
     });
 
     const allVariants = await Promise.all(variantsPromises);
@@ -992,7 +982,7 @@ shaka.hls.HlsParser = class {
    * @param {!shaka.hls.Tag} tag
    * @param {?string} resolution
    * @param {?string} frameRate
-   * @return {!Promise.<?shaka.hls.HlsParser.StreamInfos>}
+   * @return {!Promise.<!shaka.hls.HlsParser.StreamInfos>}
    * @private
    */
   async createStreamInfosForVariantTag_(tag, resolution, frameRate) {
@@ -1062,17 +1052,10 @@ shaka.hls.HlsParser = class {
       type = ContentType.VIDEO;
     }
 
-    let streamInfo;
     if (!ignoreStream) {
-      streamInfo =
+      const streamInfo =
           await this.createStreamInfoFromVariantTag_(tag, allCodecs, type);
-    }
-    if (streamInfo) {
       res[streamInfo.stream.type] = [streamInfo];
-    } else if (streamInfo === null) {
-      // Triple-equals for undefined.
-      shaka.log.debug('streamInfo is null');
-      return null;
     }
     this.filterLegacyCodecs_(res);
     return res;
@@ -1364,7 +1347,7 @@ shaka.hls.HlsParser = class {
    * Parse EXT-X-MEDIA media tag into a Stream object.
    *
    * @param {shaka.hls.Tag} tag
-   * @return {!Promise.<?shaka.hls.HlsParser.StreamInfo>}
+   * @return {!Promise.<!shaka.hls.HlsParser.StreamInfo>}
    * @private
    */
   async createStreamInfoFromMediaTag_(tag) {
@@ -1418,9 +1401,6 @@ shaka.hls.HlsParser = class {
     } else {
       this.groupIdToStreamInfosMap_.set(groupId, [streamInfo]);
     }
-    if (streamInfo == null) {
-      return null;
-    }
 
     // TODO: This check is necessary because of the possibility of multiple
     // calls to createStreamInfoFromMediaTag_ before either has resolved.
@@ -1435,7 +1415,7 @@ shaka.hls.HlsParser = class {
    * Parse EXT-X-MEDIA media tag into a Stream object.
    *
    * @param {shaka.hls.Tag} tag
-   * @return {!Promise.<?shaka.hls.HlsParser.StreamInfo>}
+   * @return {!Promise.<!shaka.hls.HlsParser.StreamInfo>}
    * @private
    */
   async createStreamInfoFromImageTag_(tag) {
@@ -1463,9 +1443,6 @@ shaka.hls.HlsParser = class {
         verbatimImagePlaylistUri, codecs, type, language, /* primary= */ false,
         name, /* channelsCount= */ null, /* closedCaptions= */ null,
         characteristics, /* forced= */ false, /* spatialAudio= */ false);
-    if (streamInfo == null) {
-      return null;
-    }
 
     // TODO: This check is necessary because of the possibility of multiple
     // calls to createStreamInfoFromImageTag_ before either has resolved.
@@ -1506,7 +1483,7 @@ shaka.hls.HlsParser = class {
    * @param {!shaka.hls.Tag} tag
    * @param {!Array.<string>} allCodecs
    * @param {string} type
-   * @return {!Promise.<?shaka.hls.HlsParser.StreamInfo>}
+   * @return {!Promise.<!shaka.hls.HlsParser.StreamInfo>}
    * @private
    */
   async createStreamInfoFromVariantTag_(tag, allCodecs, type) {
@@ -1526,9 +1503,6 @@ shaka.hls.HlsParser = class {
         /* name= */ null, /* channelcount= */ null, closedCaptions,
         /* characteristics= */ null, /* forced= */ false,
         /* spatialAudio= */ false);
-    if (streamInfo == null) {
-      return null;
-    }
     // TODO: This check is necessary because of the possibility of multiple
     // calls to createStreamInfoFromVariantTag_ before either has resolved.
     if (this.uriToStreamInfosMap_.has(verbatimMediaPlaylistUri)) {
@@ -1552,7 +1526,7 @@ shaka.hls.HlsParser = class {
    * @param {?string} characteristics
    * @param {boolean} forced
    * @param {boolean} spatialAudio
-   * @return {!Promise.<?shaka.hls.HlsParser.StreamInfo>}
+   * @return {!Promise.<!shaka.hls.HlsParser.StreamInfo>}
    * @private
    */
   async createStreamInfo_(verbatimMediaPlaylistUri, codecs, type, language,
@@ -1592,7 +1566,7 @@ shaka.hls.HlsParser = class {
    * @param {boolean} forced
    * @param {boolean} spatialAudio
    * @param {(string|undefined)} mimeType
-   * @return {!Promise.<?shaka.hls.HlsParser.StreamInfo>}
+   * @return {!Promise.<!shaka.hls.HlsParser.StreamInfo>}
    * @private
    */
   async convertParsedPlaylistIntoStreamInfo_(playlist, verbatimMediaPlaylistUri,
@@ -1635,6 +1609,8 @@ shaka.hls.HlsParser = class {
     }
 
     let encrypted = false;
+    let aesEncrypted = false;
+
     /** @type {!Array.<shaka.extern.DrmInfo>}*/
     const drmInfos = [];
     const keyIds = new Set();
@@ -1647,7 +1623,7 @@ shaka.hls.HlsParser = class {
 
         if (method == 'AES-128') {
           // These keys are handled separately.
-          this.aesEncrypted_ = true;
+          aesEncrypted = true;
         } else {
           const keyFormat = drmTag.getRequiredAttrValue('KEYFORMAT');
           const drmParser =
@@ -1668,7 +1644,7 @@ shaka.hls.HlsParser = class {
       }
     }
 
-    if (encrypted && !drmInfos.length && !this.aesEncrypted_) {
+    if (encrypted && !drmInfos.length && !aesEncrypted) {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MANIFEST,
@@ -1683,19 +1659,8 @@ shaka.hls.HlsParser = class {
     /** @type {!Map.<number, number>} */
     const mediaSequenceToStartTime = new Map();
 
-    let segments;
-    try {
-      segments = this.createSegments_(verbatimMediaPlaylistUri, playlist, type,
-          mimeType, mediaSequenceToStartTime, mediaVariables, codecs);
-    } catch (error) {
-      if (error.code == shaka.util.Error.Code.HLS_INTERNAL_SKIP_STREAM) {
-        shaka.log.alwaysWarn('Skipping unsupported HLS stream',
-            mimeType, verbatimMediaPlaylistUri);
-        return null;
-      }
-
-      throw error;
-    }
+    const segments = this.createSegments_(verbatimMediaPlaylistUri, playlist,
+        type, mimeType, mediaSequenceToStartTime, mediaVariables, codecs);
 
     const lastEndTime = segments[segments.length - 1].endTime;
     /** @type {!shaka.media.SegmentIndex} */
@@ -1757,6 +1722,7 @@ shaka.hls.HlsParser = class {
       maxTimestamp: lastEndTime,
       mediaSequenceToStartTime,
       canSkipSegments,
+      hasEndList: false,
     };
   }
 
@@ -2607,8 +2573,11 @@ shaka.hls.HlsParser = class {
     try {
       await this.update();
 
-      const delay = this.updatePlaylistDelay_;
-      this.updatePlaylistTimer_.tickAfter(/* seconds= */ delay);
+      // This may have converted to VOD, in which case we stop updating.
+      if (this.isLive_()) {
+        const delay = this.updatePlaylistDelay_;
+        this.updatePlaylistTimer_.tickAfter(/* seconds= */ delay);
+      }
     } catch (error) {
       // Detect a call to stop() during this.update()
       if (!this.playerInterface_) {
@@ -2799,7 +2768,8 @@ shaka.hls.HlsParser = class {
  *   absoluteMediaPlaylistUri: string,
  *   maxTimestamp: number,
  *   mediaSequenceToStartTime: !Map.<number, number>,
- *   canSkipSegments: boolean
+ *   canSkipSegments: boolean,
+ *   hasEndList: boolean
  * }}
  *
  * @description
@@ -2822,6 +2792,8 @@ shaka.hls.HlsParser = class {
  * @property {boolean} canSkipSegments
  *  True if the server supports delta playlist updates, and we can send a
  *  request for a playlist that can skip older media segments.
+ * @property {boolean} hasEndList
+ *  True if the stream has an EXT-X-ENDLIST tag.
  */
 shaka.hls.HlsParser.StreamInfo;
 

package/lib/media/drm_engine.js

@@ -18,9 +18,11 @@ goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.IDestroyable');
 goog.require('shaka.util.Iterables');
 goog.require('shaka.util.Lazy');
+goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MapUtils');
 goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Platform');
+goog.require('shaka.util.Pssh');
 goog.require('shaka.util.PublicPromise');
 goog.require('shaka.util.StreamUtils');
 goog.require('shaka.util.StringUtils');
@@ -497,7 +499,11 @@ shaka.media.DrmEngine = class {
 
     // Explicit init data for any one stream or an offline session is
     // sufficient to suppress 'encrypted' events for all streams.
-    if (!manifestInitData && !this.offlineSessionIds_.length) {
+    // Also suppress 'encrypted' events when parsing in-band ppsh
+    // from media segments because that serves the same purpose as the
+    // 'encrypted' events.
+    if (!manifestInitData && !this.offlineSessionIds_.length &&
+        !this.config_.parseInbandPsshEnabled) {
       this.eventManager_.listen(
           this.video_, 'encrypted', (e) => this.onEncryptedEvent_(e));
     }
@@ -668,6 +674,14 @@ shaka.media.DrmEngine = class {
       }
     }
 
+    // If there are pre-existing sessions that have all been loaded
+    // then reset the allSessionsLoaded_ promise, which can now be
+    // used to wait for new sesssions to be loaded
+    if (this.activeSessions_.size > 0 && this.areAllSessionsLoaded_()) {
+      this.allSessionsLoaded_.resolve();
+      this.allSessionsLoaded_ = new shaka.util.PublicPromise();
+      this.allSessionsLoaded_.catch(() => {});
+    }
     this.createSession(initDataType, initData,
         this.currentDrmInfo_.sessionType);
   }
@@ -2327,6 +2341,43 @@ shaka.media.DrmEngine = class {
       }
     }
   }
+
+  /**
+   * Parse  pssh from a media segment and announce new initData
+   *
+   * @param {shaka.util.ManifestParserUtils.ContentType} contentType
+   * @param {!BufferSource} mediaSegment
+   * @return {!Promise<void>}
+   */
+  parseInbandPssh(contentType, mediaSegment) {
+    if (!this.config_.parseInbandPsshEnabled) {
+      return Promise.resolve();
+    }
+
+    const ContentType = shaka.util.ManifestParserUtils.ContentType;
+    if (![ContentType.AUDIO, ContentType.VIDEO].includes(contentType)) {
+      return Promise.resolve();
+    }
+
+    const pssh = new shaka.util.Pssh(
+        shaka.util.BufferUtils.toUint8(mediaSegment));
+
+    let totalLength = 0;
+    for (const data of pssh.data) {
+      totalLength += data.length;
+    }
+    if (totalLength == 0) {
+      return Promise.resolve();
+    }
+    const combinedData = new Uint8Array(totalLength);
+    let pos = 0;
+    for (const data of pssh.data) {
+      combinedData.set(data, pos);
+      pos += data.length;
+    }
+    this.newInitData('cenc', combinedData);
+    return this.allSessionsLoaded_;
+  }
 };