shaka-player 4.3.6 → 4.3.8

package/docs/tutorials/drm-config.md

@@ -59,15 +59,18 @@ If this is the only `<ContentProtection>` element in the manifest, Shaka will
 try all key systems it knows. (Based on keySystemsByURI in
 {@linksource shaka.extern.DashManifestConfiguration}.)
 
-Through `player.configure()`, you can change the dash key systems mapping by
+Through `player.configure()`, you can update the dash key systems mapping by
 scheme URI:
+
 ```js
 player.configure({
-  dash: {
-    keySystemsByURI: {
-      'urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95': 'com.microsoft.playready.recommendation',
-      'urn:uuid:79f0049a-4098-8642-ab92-e65be0885f95': 'com.microsoft.playready.recommendation',
-    }
+  manifest: {
+    dash: {
+      keySystemsByURI: {
+        'urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95': 'com.microsoft.playready.recommendation',
+        'urn:uuid:79f0049a-4098-8642-ab92-e65be0885f95': 'com.microsoft.playready.recommendation',
+      }
+  }
   }
 });
 ```

package/docs/tutorials/welcome.md

@@ -29,7 +29,7 @@ You can build Shaka on Linux, Windows, or Mac.
 To get the sources and compile the library, you will need:
   * {@link https://git-scm.com/downloads Git v1.9+}
   * {@link https://www.python.org/downloads/ Python v2.7 or v3.5+}
-  * {@link https://java.com/en/download/ Java Runtime Environment v14+}
+  * {@link https://learn.microsoft.com/en-us/java/openjdk/download Java Runtime Environment v14+}
   * {@link https://nodejs.org/en/download/ NodeJS v14+}
   * A local web server, such as {@link https://httpd.apache.org/ Apache}
     * _NOTE: A local web server is required because browsers place restrictions

package/externs/ima.js

@@ -513,6 +513,14 @@ google.ima.dai.api.StreamRequest.prototype.streamActivityMonitorId;
 google.ima.dai.api.StreamRequest.prototype.format;
 
 
+/**
+ * @type {Object.<
+ *   google.ima.dai.api.OmidVerificationVendor,
+ *   (google.ima.dai.api.OmidAccessMode | undefined)>}
+ */
+google.ima.dai.api.StreamRequest.prototype.omidAccessModeRules;
+
+
 /**
  * @enum {string}
  */
@@ -599,3 +607,29 @@ google.ima.dai.api.StreamEvent.Type = {
   SKIPPED: 'skip',
   VIDEO_CLICKED: 'videoClicked',
 };
+
+
+/**
+ * @enum {number}
+ */
+google.ima.dai.api.OmidVerificationVendor = {
+  OTHER: 1,
+  MOAT: 2,
+  DOUBLEVERIFY: 3,
+  INTEGRAL_AD_SCIENCE: 4,
+  PIXELATE: 5,
+  NIELSEN: 6,
+  COMSCORE: 7,
+  MEETRICS: 8,
+  GOOGLE: 9,
+};
+
+
+/**
+ * @enum {string}
+ */
+google.ima.dai.api.OmidAccessMode = {
+  FULL: 'full',
+  DOMAIN: 'domain',
+  LIMITED: 'limited',
+};

package/lib/abr/simple_abr_manager.js

@@ -54,7 +54,7 @@ shaka.abr.SimpleAbrManager = class {
     // of connectivity changes.
     if (navigator.connection && navigator.connection.addEventListener) {
       this.onNetworkInformationChange_ = () => {
-        if (this.config_.useNetworkInformation && this.enabled_) {
+        if (this.enabled_ && this.config_.useNetworkInformation) {
           this.bandwidthEstimator_ = new shaka.abr.EwmaBandwidthEstimator();
           if (this.config_) {
             this.bandwidthEstimator_.configure(this.config_.advanced);

package/lib/cea/mp4_cea_parser.js

@@ -163,15 +163,17 @@ shaka.cea.Mp4CeaParser = class {
     // Fields that are found in MOOF boxes
     let defaultSampleDuration = this.defaultSampleDuration_;
     let defaultSampleSize = this.defaultSampleSize_;
-    let sampleData = [];
-    let moofOffset = null;
-    let trunOffset = null;
+    let moofOffset = 0;
+    /** @type {!Array<shaka.util.ParsedTRUNBox>} */
+    let parsedTRUNs = [];
     let baseMediaDecodeTime = null;
     let timescale = shaka.cea.ICeaParser.DEFAULT_TIMESCALE_VALUE;
 
     new Mp4Parser()
         .box('moof', (box) => {
           moofOffset = box.start;
+          // trun box parsing is reset on each moof.
+          parsedTRUNs = [];
           Mp4Parser.children(box);
         })
         .box('traf', Mp4Parser.children)
@@ -182,11 +184,8 @@ shaka.cea.Mp4CeaParser = class {
 
           const parsedTRUN = shaka.util.Mp4BoxParsers.parseTRUN(
               box.reader, box.version, box.flags);
-
-          sampleData = parsedTRUN.sampleData;
-          trunOffset = parsedTRUN.dataOffset;
+          parsedTRUNs.push(parsedTRUN);
         })
-
         .fullBox('tfhd', (box) => {
           goog.asserts.assert(
               box.flags != null,
@@ -210,7 +209,6 @@ shaka.cea.Mp4CeaParser = class {
             timescale = this.trackIdToTimescale_.get(trackId);
           }
         })
-
         .fullBox('tfdt', (box) => {
           goog.asserts.assert(
               box.version != null,
@@ -223,16 +221,19 @@ shaka.cea.Mp4CeaParser = class {
         })
         .box('mdat', (box) => {
           if (baseMediaDecodeTime === null) {
-            // This field should have been populated by
-            // the Base Media Decode time in the TFDT box
+            // This field should have been populated by the Base Media Decode
+            // Time in the tfdt box.
+            shaka.log.alwaysWarn(
+                'Unable to find base media decode time for CEA captions!');
             throw new shaka.util.Error(
                 shaka.util.Error.Severity.CRITICAL,
                 shaka.util.Error.Category.TEXT,
                 shaka.util.Error.Code.INVALID_MP4_CEA);
           }
-          const offset = (moofOffset || 0) + (trunOffset || 0) - box.start - 8;
+
+          const offset = moofOffset - box.start - 8;
           this.parseMdat_(box.reader, baseMediaDecodeTime, timescale,
-              defaultSampleDuration, defaultSampleSize, offset, sampleData,
+              defaultSampleDuration, defaultSampleSize, offset, parsedTRUNs,
               captionPackets);
         })
         .parse(mediaSegment, /* partialOkay= */ false);
@@ -248,12 +249,12 @@ shaka.cea.Mp4CeaParser = class {
    * @param {number} defaultSampleDuration
    * @param {number} defaultSampleSize
    * @param {number} offset
-   * @param {!Array<shaka.util.ParsedTRUNSample>} sampleData
+   * @param {!Array<shaka.util.ParsedTRUNBox>} parsedTRUNs
    * @param {!Array<!shaka.cea.ICeaParser.CaptionPacket>} captionPackets
    * @private
    */
   parseMdat_(reader, time, timescale, defaultSampleDuration,
-      defaultSampleSize, offset, sampleData, captionPackets) {
+      defaultSampleSize, offset, parsedTRUNs, captionPackets) {
     const BitstreamFormat = shaka.cea.Mp4CeaParser.BitstreamFormat;
     const ICeaParser = shaka.cea.ICeaParser;
     let sampleIndex = 0;
@@ -264,17 +265,23 @@ shaka.cea.Mp4CeaParser = class {
     // composition time offset, we default to 0.
     let sampleSize = defaultSampleSize;
 
+    // Combine all sample data.  This assumes that the samples described across
+    // multiple trun boxes are still continuous in the mdat box.
+    const sampleDatas = parsedTRUNs.map((t) => t.sampleData);
+    const sampleData = [].concat(...sampleDatas);
+
     if (sampleData.length) {
       sampleSize = sampleData[0].sampleSize || defaultSampleSize;
     }
 
-    reader.skip(offset);
+    reader.skip(offset + parsedTRUNs[0].dataOffset);
 
     while (reader.hasMoreData()) {
       const naluSize = reader.readUint32();
       const naluHeader = reader.readUint8();
       let naluType = null;
       let isSeiMessage = false;
+      let naluHeaderSize = 1;
 
       goog.asserts.assert(this.bitstreamFormat_ != BitstreamFormat.UNKNOWN,
           'Bitstream format should have been checked before now!');
@@ -285,6 +292,8 @@ shaka.cea.Mp4CeaParser = class {
           break;
 
         case BitstreamFormat.H265:
+          naluHeaderSize = 2;
+          reader.skip(1);
           naluType = (naluHeader >> 1) & 0x3f;
           isSeiMessage =
               naluType == ICeaParser.H265_PREFIX_NALU_TYPE_SEI ||
@@ -298,13 +307,13 @@ shaka.cea.Mp4CeaParser = class {
       if (isSeiMessage) {
         let timeOffset = 0;
 
-        if (sampleData.length > sampleIndex) {
+        if (sampleIndex < sampleData.length) {
           timeOffset = sampleData[sampleIndex].sampleCompositionTimeOffset || 0;
         }
 
         const pts = (time + timeOffset)/timescale;
         for (const packet of this.seiProcessor_
-            .process(reader.readBytes(naluSize - 1))) {
+            .process(reader.readBytes(naluSize - naluHeaderSize))) {
           captionPackets.push({
             packet,
             pts,
@@ -312,7 +321,7 @@ shaka.cea.Mp4CeaParser = class {
         }
       } else {
         try {
-          reader.skip(naluSize - 1);
+          reader.skip(naluSize - naluHeaderSize);
         } catch (e) {
           // It is necessary to ignore this error because it can break the start
           // of playback even if the user does not want to see the subtitles.
@@ -321,7 +330,7 @@ shaka.cea.Mp4CeaParser = class {
       }
       sampleSize -= (naluSize + 4);
       if (sampleSize == 0) {
-        if (sampleData.length > sampleIndex) {
+        if (sampleIndex < sampleData.length) {
           time += sampleData[sampleIndex].sampleDuration ||
               defaultSampleDuration;
         } else {
@@ -330,7 +339,7 @@ shaka.cea.Mp4CeaParser = class {
 
         sampleIndex++;
 
-        if (sampleData.length > sampleIndex) {
+        if (sampleIndex < sampleData.length) {
           sampleSize = sampleData[sampleIndex].sampleSize || defaultSampleSize;
         } else {
           sampleSize = defaultSampleSize;

package/lib/dash/dash_parser.js

@@ -886,7 +886,19 @@ shaka.dash.DashParser = class {
 
     // Parallel for HLS VIDEO-RANGE as defined in DASH-IF IOP v4.3 6.2.5.1.
     let videoRange;
-    const videoRangeScheme = 'urn:mpeg:mpegB:cicp:TransferCharacteristics';
+
+    // Ref. https://dashif.org/docs/DASH-IF-IOP-v4.3.pdf
+    // If signaled, a Supplemental or Essential Property descriptor
+    // shall be used, with the schemeIdUri set to
+    // urn:mpeg:mpegB:cicp:<Parameter> as defined in
+    // ISO/IEC 23001-8 [49] and <Parameter> one of the
+    // following: ColourPrimaries, TransferCharacteristics,
+    // or MatrixCoefficients.
+    const scheme = 'urn:mpeg:mpegB:cicp';
+    const transferCharacteristicsScheme = `${scheme}:TransferCharacteristics`;
+    const colourPrimariesScheme = `${scheme}:ColourPrimaries`;
+    const matrixCoefficientsScheme = `${scheme}:MatrixCoefficients`;
+
     const getVideoRangeFromTransferCharacteristicCICP = (cicp) => {
       switch (cicp) {
         case 1:
@@ -912,10 +924,13 @@ shaka.dash.DashParser = class {
       const schemeId = prop.getAttribute('schemeIdUri');
       if (schemeId == 'http://dashif.org/guidelines/trickmode') {
         trickModeFor = prop.getAttribute('value');
-      } else if (schemeId == videoRangeScheme) {
+      } else if (schemeId == transferCharacteristicsScheme) {
         videoRange = getVideoRangeFromTransferCharacteristicCICP(
             parseInt(prop.getAttribute('value'), 10),
         );
+      } else if (schemeId == colourPrimariesScheme ||
+                 schemeId == matrixCoefficientsScheme) {
+        continue;
       } else {
         unrecognizedEssentialProperty = true;
       }
@@ -925,7 +940,7 @@ shaka.dash.DashParser = class {
         XmlUtils.findChildren(elem, 'SupplementalProperty');
     for (const prop of supplementalProperties) {
       const schemeId = prop.getAttribute('schemeIdUri');
-      if (schemeId == videoRangeScheme) {
+      if (schemeId == transferCharacteristicsScheme) {
         videoRange = getVideoRangeFromTransferCharacteristicCICP(
             parseInt(prop.getAttribute('value'), 10),
         );

package/lib/hls/hls_parser.js

@@ -319,6 +319,9 @@ shaka.hls.HlsParser = class {
       this.presentationTimeline_.setDuration(Math.min(...maxTimestamps));
       this.playerInterface_.updateDuration();
     }
+    if (stillLive) {
+      this.determineDuration_();
+    }
   }
 
   /**
@@ -400,9 +403,16 @@ shaka.hls.HlsParser = class {
           mediaSequenceNumber);
       stream.segmentIndex.evict(playlistStartTime);
     }
+    const oldSegment = segments[0];
+    goog.asserts.assert(oldSegment, 'Should have segments!');
+
+    streamInfo.minTimestamp = oldSegment.startTime;
+
     const newestSegment = segments[segments.length - 1];
     goog.asserts.assert(newestSegment, 'Should have segments!');
 
+    streamInfo.maxTimestamp = newestSegment.endTime;
+
     // Once the last segment has been added to the playlist,
     // #EXT-X-ENDLIST tag will be appended.
     // If that happened, treat the rest of the EVENT presentation as VOD.
@@ -413,7 +423,6 @@ shaka.hls.HlsParser = class {
       // 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,6 +585,9 @@ shaka.hls.HlsParser = class {
    * @private
    */
   offsetStreamInfo_(streamInfo, offset) {
+    // Adjust our accounting of the minimum timestamp.
+    streamInfo.minTimestamp += offset;
+
     // Adjust our accounting of the maximum timestamp.
     streamInfo.maxTimestamp += offset;
     goog.asserts.assert(streamInfo.maxTimestamp >= 0,
@@ -804,7 +816,7 @@ shaka.hls.HlsParser = class {
       const PresentationType = shaka.hls.HlsParser.PresentationType_;
 
       if (this.presentationType_ == PresentationType.LIVE) {
-        let segmentAvailabilityDuration = this.getMinDuration_();
+        let segmentAvailabilityDuration = this.getLiveDuration_();
 
         // This defaults to the presentation delay, which has the effect of
         // making the live stream unseekable.  This is consistent with Apple's
@@ -1655,6 +1667,7 @@ shaka.hls.HlsParser = class {
       verbatimMediaPlaylistUri,
       // These values are filled out or updated after lazy-loading:
       absoluteMediaPlaylistUri: initialMediaPlaylistUri,
+      minTimestamp: 0,
       maxTimestamp: 0,
       mediaSequenceToStartTime: new Map(),
       canSkipSegments: false,
@@ -1700,6 +1713,7 @@ shaka.hls.HlsParser = class {
 
       // Copy values from the real stream info to our initial one.
       streamInfo.absoluteMediaPlaylistUri = absoluteMediaPlaylistUri;
+      streamInfo.minTimestamp = realStreamInfo.minTimestamp;
       streamInfo.maxTimestamp = realStreamInfo.maxTimestamp;
       streamInfo.canSkipSegments = realStreamInfo.canSkipSegments;
       streamInfo.hasEndList = realStreamInfo.hasEndList;
@@ -1833,6 +1847,22 @@ shaka.hls.HlsParser = class {
     return minDuration;
   }
 
+  /**
+   * @return {number}
+   * @private
+   */
+  getLiveDuration_() {
+    let maxTimestamp = Infinity;
+    let minTimestamp = Infinity;
+    for (const streamInfo of this.uriToStreamInfosMap_.values()) {
+      if (streamInfo.stream.segmentIndex && streamInfo.stream.type != 'text') {
+        maxTimestamp = Math.min(maxTimestamp, streamInfo.maxTimestamp);
+        minTimestamp = Math.min(minTimestamp, streamInfo.minTimestamp);
+      }
+    }
+    return maxTimestamp - minTimestamp;
+  }
+
   /**
    * @param {!Array.<!shaka.extern.Stream>} streams
    * @private
@@ -1978,6 +2008,7 @@ shaka.hls.HlsParser = class {
       this.determinePresentationType_(playlist);
     }
 
+    const firstStartTime = segments[0].startTime;
     const lastEndTime = segments[segments.length - 1].endTime;
     /** @type {!shaka.media.SegmentIndex} */
     const segmentIndex = new shaka.media.SegmentIndex(segments);
@@ -2000,6 +2031,7 @@ shaka.hls.HlsParser = class {
       type,
       verbatimMediaPlaylistUri,
       absoluteMediaPlaylistUri,
+      minTimestamp: firstStartTime,
       maxTimestamp: lastEndTime,
       canSkipSegments,
       hasEndList: false,
@@ -2034,6 +2066,22 @@ shaka.hls.HlsParser = class {
     // stream is lazy-loaded.
     const mimeType = this.guessMimeTypeBeforeLoading_(type, codecs) ||
         this.guessMimeTypeFallback_(type);
+    const roles = [];
+    if (characteristics) {
+      for (const characteristic of characteristics.split(',')) {
+        roles.push(characteristic);
+      }
+    }
+
+    const kind = (type == shaka.util.ManifestParserUtils.ContentType.TEXT) ?
+        shaka.util.ManifestParserUtils.TextStreamKind.SUBTITLE : undefined;
+
+    // If there are no roles, and we have defaulted to the subtitle "kind" for
+    // this track, add the implied subtitle role.
+    if (!roles.length &&
+        kind === shaka.util.ManifestParserUtils.TextStreamKind.SUBTITLE) {
+      roles.push(shaka.util.ManifestParserUtils.TextStreamKind.SUBTITLE);
+    }
 
     return {
       id: this.globalId_++,
@@ -2042,8 +2090,7 @@ shaka.hls.HlsParser = class {
       segmentIndex: null,
       mimeType,
       codecs,
-      kind: (type == shaka.util.ManifestParserUtils.ContentType.TEXT) ?
-          shaka.util.ManifestParserUtils.TextStreamKind.SUBTITLE : undefined,
+      kind,
       encrypted: false,
       drmInfos: [],
       keyIds: new Set(),
@@ -2059,7 +2106,7 @@ shaka.hls.HlsParser = class {
       width: undefined,
       height: undefined,
       bandwidth: undefined,
-      roles: characteristics ? characteristics.split(',') : [],
+      roles,
       forced,
       channelsCount,
       audioSamplingRate: null,
@@ -2498,6 +2545,9 @@ shaka.hls.HlsParser = class {
             /* tileDuration= */ null,
             /* syncTime= */ null,
             partialStatus);
+        if (item.name == 'EXT-X-PRELOAD-HINT') {
+          partial.markAsPreload();
+        }
         partialSegmentRefs.push(partial);
       } // for-loop of hlsSegment.partialSegments
     }
@@ -2514,6 +2564,10 @@ shaka.hls.HlsParser = class {
       // We're interested in the duration part.
       const extinfValues = extinfTag.value.split(',');
       const duration = Number(extinfValues[0]);
+      // Skip segments without duration
+      if (duration == 0) {
+        return null;
+      }
       endTime = startTime + duration;
     } else {
       endTime = partialSegmentRefs[partialSegmentRefs.length - 1].endTime;
@@ -2694,9 +2748,9 @@ shaka.hls.HlsParser = class {
           type,
           lastDiscontinuityStartTime,
           hlsAes128Key);
-      previousReference = reference;
 
       if (reference) {
+        previousReference = reference;
         reference.discontinuitySequence = discontinuitySequence;
 
         if (this.config_.hls.ignoreManifestProgramDateTime &&
@@ -2807,6 +2861,9 @@ shaka.hls.HlsParser = class {
    * @private
    */
   variableSubstitution_(uri, variables) {
+    if (!variables.size) {
+      return uri;
+    }
     let newUri = String(uri).replace(/%7B/g, '{').replace(/%7D/g, '}');
 
     const uriVariables = newUri.match(/{\$\w*}/g);
@@ -3252,6 +3309,7 @@ shaka.hls.HlsParser = class {
  *   type: string,
  *   verbatimMediaPlaylistUri: string,
  *   absoluteMediaPlaylistUri: string,
+ *   minTimestamp: number,
  *   maxTimestamp: number,
  *   mediaSequenceToStartTime: !Map.<number, number>,
  *   canSkipSegments: boolean,
@@ -3275,6 +3333,8 @@ shaka.hls.HlsParser = class {
  * @property {string} absoluteMediaPlaylistUri
  *   The absolute media playlist URI, resolved relative to the master playlist
  *   and updated to reflect any redirects.
+ * @property {number} minTimestamp
+ *   The minimum timestamp found in the stream.
  * @property {number} maxTimestamp
  *   The maximum timestamp found in the stream.
  * @property {!Map.<number, number>} mediaSequenceToStartTime

package/lib/hls/manifest_text_parser.js

@@ -158,7 +158,15 @@ shaka.hls.ManifestTextParser = class {
             partialSegmentTags.push(tag);
           } else if (tag.name == 'EXT-X-PRELOAD-HINT') {
             if (tag.getAttributeValue('TYPE') == 'PART') {
-              partialSegmentTags.push(tag);
+              // Note: BYTERANGE-START without BYTERANGE-LENGTH is being
+              // ignored.
+              if (tag.getAttributeValue('BYTERANGE-START') != null) {
+                if (tag.getAttributeValue('BYTERANGE-LENGTH') != null) {
+                  partialSegmentTags.push(tag);
+                }
+              } else {
+                partialSegmentTags.push(tag);
+              }
             } else if (tag.getAttributeValue('TYPE') == 'MAP') {
               // Rename the Preload Hint tag to be a Map tag.
               tag.setName('EXT-X-MAP');
@@ -300,6 +308,7 @@ shaka.hls.ManifestTextParser.MEDIA_PLAYLIST_TAGS = [
   'EXT-X-ENDLIST',
   'EXT-X-SERVER-CONTROL',
   'EXT-X-SKIP',
+  'EXT-X-PART-INF',
 ];
 
 

package/lib/media/drm_engine.js

@@ -133,6 +133,9 @@ shaka.media.DrmEngine = class {
 
     /** @private {Promise} */
     this.mediaKeysAttached_ = null;
+
+    /** @private {?shaka.extern.InitDataOverride} */
+    this.manifestInitData_ = null;
   }
 
   /** @override */
@@ -351,18 +354,24 @@ shaka.media.DrmEngine = class {
       shaka.media.DrmEngine.replaceDrmInfo_(variants, servers);
     }
 
-    // Make sure all the drm infos are valid and filled in correctly.
+    /** @type {!Set<shaka.extern.DrmInfo>} */
+    const drmInfos = new Set();
     for (const variant of variants) {
-      const drmInfos = this.getVariantDrmInfos_(variant);
-      for (const info of drmInfos) {
-        shaka.media.DrmEngine.fillInDrmInfoDefaults_(
-            info,
-            shaka.util.MapUtils.asMap(this.config_.servers),
-            shaka.util.MapUtils.asMap(this.config_.advanced || {}),
-            this.config_.keySystemsMapping);
+      const variantDrmInfos = this.getVariantDrmInfos_(variant);
+      for (const info of variantDrmInfos) {
+        drmInfos.add(info);
       }
     }
 
+    for (const info of drmInfos) {
+      shaka.media.DrmEngine.fillInDrmInfoDefaults_(
+          info,
+          shaka.util.MapUtils.asMap(this.config_.servers),
+          shaka.util.MapUtils.asMap(this.config_.advanced || {}),
+          this.config_.keySystemsMapping);
+    }
+
+
     /** @type {!Map.<string, MediaKeySystemConfiguration>} */
     let configsByKeySystem;
 
@@ -480,10 +489,10 @@ shaka.media.DrmEngine = class {
           () => this.closeOpenSessions_());
     }
 
-    const manifestInitData = this.currentDrmInfo_ ?
-      this.currentDrmInfo_.initData.find(
+    this.manifestInitData_ = this.currentDrmInfo_ ?
+      (this.currentDrmInfo_.initData.find(
           (initDataOverride) => initDataOverride.initData.length > 0,
-      ) : null;
+      ) || null) : null;
 
     /**
      * We can attach media keys before the playback actually begins when:
@@ -491,7 +500,7 @@ shaka.media.DrmEngine = class {
      *  - Some initData already has been generated (through the manifest)
      *  - In case of an offline session
      */
-    if (manifestInitData ||
+    if (this.manifestInitData_ ||
         this.currentDrmInfo_.keySystem !== 'com.apple.fps' ||
         this.offlineSessionIds_.length) {
       await this.attachMediaKeys_();
@@ -504,7 +513,7 @@ shaka.media.DrmEngine = class {
     // 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 &&
+    if (!this.manifestInitData_ && !this.offlineSessionIds_.length &&
         !this.config_.parseInbandPsshEnabled) {
       this.eventManager_.listen(
           this.video_, 'encrypted', (e) => this.onEncryptedEvent_(e));
@@ -2361,7 +2370,7 @@ shaka.media.DrmEngine = class {
    * @return {!Promise<void>}
    */
   parseInbandPssh(contentType, mediaSegment) {
-    if (!this.config_.parseInbandPsshEnabled) {
+    if (!this.config_.parseInbandPsshEnabled || this.manifestInitData_) {
       return Promise.resolve();
     }
 

package/lib/media/gap_jumping_controller.js

@@ -58,6 +58,9 @@ shaka.media.GapJumpingController = class {
     /** @private {number} */
     this.prevReadyState_ = video.readyState;
 
+    /** @private {number} */
+    this.startTime_ = 0;
+
     /** @private {number} */
     this.gapsJumped_ = 0;
 
@@ -123,6 +126,18 @@ shaka.media.GapJumpingController = class {
     this.onPollGapJump_();
   }
 
+  /**
+   * Called when playback has started and the video element is
+   * listening for seeks.
+   *
+   * @param {number} startTime
+   */
+  onStarted(startTime) {
+    if (this.video_.seeking && !this.seekingEventReceived_) {
+      this.seekingEventReceived_ = true;
+      this.startTime_ = startTime;
+    }
+  }
 
   /** Called when a seek has started. */
   onSeeking() {
@@ -164,8 +179,8 @@ shaka.media.GapJumpingController = class {
     // while paused on a livestream.  We make an exception for time 0, since we
     // may be _required_ to seek on startup before play can begin, but only if
     // autoplay is enabled.
-    if (this.video_.paused && (this.video_.currentTime != 0 ||
-      (!this.video_.autoplay && this.video_.currentTime == 0))) {
+    if (this.video_.paused && (this.video_.currentTime != this.startTime_ ||
+      (!this.video_.autoplay && this.video_.currentTime == this.startTime_))) {
       return;
     }
 
@@ -228,6 +243,13 @@ shaka.media.GapJumpingController = class {
     }
 
     this.video_.currentTime = jumpTo;
+    // This accounts for the possibility that we jump a gap at the start
+    // position but we jump _into_ another gap. By setting the start
+    // position to the new jumpTo we ensure that the check above will
+    // pass even though the video is still paused.
+    if (currentTime == this.startTime_) {
+      this.startTime_ = jumpTo;
+    }
     this.gapsJumped_++;
     this.onEvent_(
         new shaka.util.FakeEvent(shaka.util.FakeEvent.EventName.GapJumped));