shaka-player 4.4.2 → 4.4.3

package/docs/tutorials/offline.md

@@ -537,7 +537,7 @@ function downloadContent(manifestUri, title) {
     'downloaded': Date()
   };
 
-  return window.storage.store(manifestUri, metadata);
+  return window.storage.store(manifestUri, metadata).promise;
 }
 
 /*

package/lib/dash/dash_parser.js

@@ -533,7 +533,10 @@ shaka.dash.DashParser = class {
       // Just update the variants and text streams, which may change as periods
       // are added or removed.
       this.manifest_.variants = this.periodCombiner_.getVariants();
-      this.manifest_.textStreams = this.periodCombiner_.getTextStreams();
+      const textStreams = this.periodCombiner_.getTextStreams();
+      if (textStreams.length > 0) {
+        this.manifest_.textStreams = textStreams;
+      }
       this.manifest_.imageStreams = this.periodCombiner_.getImageStreams();
 
       // Re-filter the manifest.  This will check any configured restrictions on

package/lib/hls/hls_parser.js

@@ -787,7 +787,7 @@ shaka.hls.HlsParser = class {
     // enough info here to determine the presentation type and duration.
     if (playlist.type == shaka.hls.PlaylistType.MEDIA) {
       if (this.isLive_()) {
-        this.changePresentationTimelineToLive_();
+        this.changePresentationTimelineToLive_(playlist);
         const delay = this.getUpdatePlaylistDelay_();
         this.updatePlaylistTimer_.tickAfter(/* seconds= */ delay);
       }
@@ -856,7 +856,7 @@ shaka.hls.HlsParser = class {
 
     let segmentUris = [firstSegment.absoluteUri];
     const initSegmentRef = this.getInitSegmentReference_(
-        playlist.absoluteUri, firstSegment.tags, new Map());
+        playlist, firstSegment.tags, new Map());
     if (initSegmentRef) {
       segmentUris = initSegmentRef.getUris();
     }
@@ -1781,7 +1781,13 @@ shaka.hls.HlsParser = class {
       goog.asserts.assert(tag.name == 'EXT-X-MEDIA',
           'Should only be called on media tags!');
       const languageValue = tag.getAttributeValue('LANGUAGE');
-      const language = this.getLanguage_(languageValue);
+      let language = this.getLanguage_(languageValue);
+      if (!languageValue) {
+        const nameValue = tag.getAttributeValue('NAME');
+        if (nameValue) {
+          language = nameValue;
+        }
+      }
 
       // The GROUP-ID value is a quoted-string that specifies the group to which
       // the Rendition belongs.
@@ -1790,7 +1796,9 @@ shaka.hls.HlsParser = class {
       // The value of INSTREAM-ID is a quoted-string that specifies a Rendition
       // within the segments in the Media Playlist. This attribute is REQUIRED
       // if the TYPE attribute is CLOSED-CAPTIONS.
-      const instreamId = tag.getRequiredAttrValue('INSTREAM-ID');
+      // We need replace SERVICE string by our internal svc string.
+      const instreamId = tag.getRequiredAttrValue('INSTREAM-ID')
+          .replace('SERVICE', 'svc');
       if (!this.groupIdToClosedCaptionsMap_.get(groupId)) {
         this.groupIdToClosedCaptionsMap_.set(groupId, new Map());
       }
@@ -2054,7 +2062,7 @@ shaka.hls.HlsParser = class {
       if (this.isLive_() && !wasLive) {
         // Now that we know that the presentation is live, convert the timeline
         // to live.
-        this.changePresentationTimelineToLive_();
+        this.changePresentationTimelineToLive_(playlist);
       }
 
       // Copy values from the real stream info to our initial one.
@@ -2770,9 +2778,10 @@ shaka.hls.HlsParser = class {
 
 
   /**
+   * @param {!shaka.hls.Playlist} playlist
    * @private
    */
-  changePresentationTimelineToLive_() {
+  changePresentationTimelineToLive_(playlist) {
     // The live edge will be calculated from segments, so we don't need to
     // set a presentation start time.  We will assert later that this is
     // working as expected.
@@ -2795,8 +2804,12 @@ shaka.hls.HlsParser = class {
     } else if (this.presentationDelay_) {
       presentationDelay = this.presentationDelay_;
     } else {
-      const numberOfSegments = this.config_.hls.liveSegmentsDelay;
-      presentationDelay = this.maxTargetDuration_ * numberOfSegments;
+      const playlistSegments = playlist.segments.length;
+      let delaySegments = this.config_.hls.liveSegmentsDelay;
+      if (delaySegments > (playlistSegments - 2)) {
+        delaySegments = Math.max(1, playlistSegments - 2);
+      }
+      presentationDelay = this.maxTargetDuration_ * delaySegments;
     }
 
     this.presentationTimeline_.setPresentationStartTime(0);
@@ -2806,13 +2819,13 @@ shaka.hls.HlsParser = class {
 
   /**
    * Get the InitSegmentReference for a segment if it has a EXT-X-MAP tag.
-   * @param {string} playlistUri The absolute uri of the media playlist.
+   * @param {!shaka.hls.Playlist} playlist
    * @param {!Array.<!shaka.hls.Tag>} tags Segment tags
    * @param {!Map.<string, string>} variables
    * @return {shaka.media.InitSegmentReference}
    * @private
    */
-  getInitSegmentReference_(playlistUri, tags, variables) {
+  getInitSegmentReference_(playlist, tags, variables) {
     /** @type {?shaka.hls.Tag} */
     const mapTag = shaka.hls.Utils.getFirstTagWithName(tags, 'EXT-X-MAP');
 
@@ -2823,7 +2836,7 @@ shaka.hls.HlsParser = class {
     const verbatimInitSegmentUri = mapTag.getRequiredAttrValue('URI');
     const absoluteInitSegmentUri = this.variableSubstitution_(
         shaka.hls.Utils.constructAbsoluteUri(
-            playlistUri, verbatimInitSegmentUri),
+            playlist.absoluteUri, verbatimInitSegmentUri),
         variables);
 
     const mapTagKey = [
@@ -2831,8 +2844,18 @@ shaka.hls.HlsParser = class {
       mapTag.getAttributeValue('BYTERANGE', ''),
     ].join('-');
     if (!this.mapTagToInitSegmentRefMap_.has(mapTagKey)) {
+      /** @type {shaka.extern.HlsAes128Key|undefined} */
+      let aes128Key = undefined;
+      for (const tag of tags) {
+        if (tag.name == 'EXT-X-KEY') {
+          if (tag.getRequiredAttrValue('METHOD') == 'AES-128' &&
+              tag.id < mapTag.id) {
+            aes128Key = this.parseAES128DrmTag_(tag, playlist);
+          }
+        }
+      }
       const initSegmentRef = this.createInitSegmentReference_(
-          absoluteInitSegmentUri, mapTag);
+          absoluteInitSegmentUri, mapTag, aes128Key);
       this.mapTagToInitSegmentRefMap_.set(mapTagKey, initSegmentRef);
     }
     return this.mapTagToInitSegmentRefMap_.get(mapTagKey);
@@ -2843,10 +2866,11 @@ shaka.hls.HlsParser = class {
    * playlist.
    * @param {string} absoluteInitSegmentUri
    * @param {!shaka.hls.Tag} mapTag EXT-X-MAP
+   * @param {shaka.extern.HlsAes128Key=} aes128Key
    * @return {!shaka.media.InitSegmentReference}
    * @private
    */
-  createInitSegmentReference_(absoluteInitSegmentUri, mapTag) {
+  createInitSegmentReference_(absoluteInitSegmentUri, mapTag, aes128Key) {
     let startByte = 0;
     let endByte = null;
     const byterange = mapTag.getAttributeValue('BYTERANGE');
@@ -2857,12 +2881,26 @@ shaka.hls.HlsParser = class {
       const byteLength = Number(blocks[0]);
       startByte = Number(blocks[1]);
       endByte = startByte + byteLength - 1;
+
+      if (aes128Key) {
+        // MAP segment encrypted with method 'AES-128', when served with
+        // HTTP Range, has the unencrypted size specified in the range.
+        // See: https://tools.ietf.org/html/draft-pantos-hls-rfc8216bis-08#section-6.3.6
+        const length = (endByte + 1) - startByte;
+        if (length % 16) {
+          endByte += (16 - (length % 16));
+        }
+      }
     }
 
     const initSegmentRef = new shaka.media.InitSegmentReference(
         () => [absoluteInitSegmentUri],
         startByte,
-        endByte);
+        endByte,
+        /* mediaQuality= */ null,
+        /* timescale= */ null,
+        /* segmentData= */ null,
+        aes128Key);
     return initSegmentRef;
   }
 
@@ -2877,15 +2915,13 @@ shaka.hls.HlsParser = class {
    * @param {string} absoluteMediaPlaylistUri
    * @param {string} type
    * @param {string} mimeType
-   * @param {number} timestampOffset
    * @param {shaka.extern.HlsAes128Key=} hlsAes128Key
    * @return {shaka.media.SegmentReference}
    * @private
    */
   createSegmentReference_(
       initSegmentReference, previousReference, hlsSegment, startTime,
-      variables, absoluteMediaPlaylistUri, type, mimeType, timestampOffset,
-      hlsAes128Key) {
+      variables, absoluteMediaPlaylistUri, type, mimeType, hlsAes128Key) {
     const tags = hlsSegment.tags;
     const extinfTag =
         shaka.hls.Utils.getFirstTagWithName(tags, 'EXTINF');
@@ -3022,7 +3058,7 @@ shaka.hls.HlsParser = class {
             pStartByte,
             pEndByte,
             initSegmentReference,
-            /* timestampOffset= */ 0, // This value is ignored in sequence mode.
+            /* timestampOffset= */ 0,
             /* appendWindowStart= */ 0,
             /* appendWindowEnd= */ Infinity,
             /* partialReferences= */ [],
@@ -3067,8 +3103,11 @@ shaka.hls.HlsParser = class {
         return null;
       }
       endTime = startTime + duration;
-    } else {
+    } else if (partialSegmentRefs.length) {
       endTime = partialSegmentRefs[partialSegmentRefs.length - 1].endTime;
+    } else {
+      // Skip segments without duration and without partialsegments
+      return null;
     }
 
     if (segmentWithByteRangeOptimization) {
@@ -3131,7 +3170,7 @@ shaka.hls.HlsParser = class {
         startByte,
         endByte,
         initSegmentReference,
-        timestampOffset, // This value is ignored in sequence mode.
+        /* timestampOffset= */ 0,
         /* appendWindowStart= */ 0,
         /* appendWindowEnd= */ Infinity,
         partialSegmentRefs,
@@ -3230,7 +3269,6 @@ shaka.hls.HlsParser = class {
     const references = [];
 
     let previousReference = null;
-    let lastDiscontinuityStartTime = firstStartTime;
 
     /** @type {!Array.<{bitrate: number, duration: number}>} */
     const bitrates = [];
@@ -3245,7 +3283,6 @@ shaka.hls.HlsParser = class {
           item.tags, 'EXT-X-DISCONTINUITY');
       if (discontinuityTag) {
         discontinuitySequence++;
-        lastDiscontinuityStartTime = startTime;
       }
 
       // Apply new AES-128 tags as you see them, keeping a running total.
@@ -3261,7 +3298,7 @@ shaka.hls.HlsParser = class {
 
       mediaSequenceToStartTime.set(position, startTime);
 
-      initSegmentRef = this.getInitSegmentReference_(playlist.absoluteUri,
+      initSegmentRef = this.getInitSegmentReference_(playlist,
           item.tags, variables);
 
       // If the stream is low latency and the user has not configured the
@@ -3285,7 +3322,6 @@ shaka.hls.HlsParser = class {
           playlist.absoluteUri,
           type,
           mimeType,
-          lastDiscontinuityStartTime,
           hlsAes128Key);
 
       if (reference) {

package/lib/media/segment_index.js

@@ -708,7 +708,7 @@ shaka.media.MetaSegmentIndex = class extends shaka.media.SegmentIndex {
       }
 
       numPassedInEarlierIndexes += index.numEvicted_ +
-        index.references.length;
+        index.getNumReferences();
     }
 
     return null;
@@ -732,9 +732,9 @@ shaka.media.MetaSegmentIndex = class extends shaka.media.SegmentIndex {
         return reference;
       }
 
-      numPassedInEarlierIndexes += index.numEvicted_ +
-        index.references.length;
-      sawSegments = sawSegments || index.references.length != 0;
+      const num = index.getNumReferences();
+      numPassedInEarlierIndexes += index.numEvicted_ + num;
+      sawSegments = sawSegments || num != 0;
     }
 
     return null;

package/lib/media/segment_reference.js

@@ -32,9 +32,11 @@ shaka.media.InitSegmentReference = class {
    *   the quality of the media associated with this init segment.
    * @param {(null|number)=} timescale
    * @param {(null|BufferSource)=} segmentData
+   * @param {?shaka.extern.HlsAes128Key=} aes128Key
+   *  The segment's AES-128-CBC full segment encryption key and iv.
    */
   constructor(uris, startByte, endByte, mediaQuality = null, timescale = null,
-      segmentData = null) {
+      segmentData = null, aes128Key = null) {
     /** @type {function():!Array.<string>} */
     this.getUris = uris;
 
@@ -52,6 +54,9 @@ shaka.media.InitSegmentReference = class {
 
     /** @type {BufferSource|null} */
     this.segmentData = segmentData;
+
+    /** @type {?shaka.extern.HlsAes128Key} */
+    this.hlsAes128Key = aes128Key;
   }
 
   /**

package/lib/media/streaming_engine.js

@@ -1409,15 +1409,11 @@ shaka.media.StreamingEngine = class {
             'ReadableStream is not supported by the browser.');
         }
         const fetchSegment = this.fetch_(mediaState, reference);
-        let result = await fetchSegment;
+        const result = await fetchSegment;
         this.destroyer_.ensureNotDestroyed();
         if (this.fatalError_) {
           return;
         }
-        if (reference.hlsAes128Key) {
-          goog.asserts.assert(iter, 'mediaState.segmentIterator should exist');
-          result = await this.aes128Decrypt_(result, reference, iter);
-        }
         this.destroyer_.ensureNotDestroyed();
 
         // If the text stream gets switched between fetch_() and append_(), the
@@ -1502,13 +1498,13 @@ shaka.media.StreamingEngine = class {
 
   /**
    * @param {!BufferSource} rawResult
-   * @param {!shaka.media.SegmentReference} reference
+   * @param {shaka.extern.HlsAes128Key} aes128Key
    * @param {!shaka.media.SegmentIterator} iter
    * @return {!Promise.<!BufferSource>} finalResult
    * @private
    */
-  async aes128Decrypt_(rawResult, reference, iter) {
-    const key = reference.hlsAes128Key;
+  async aes128Decrypt_(rawResult, aes128Key, iter) {
+    const key = aes128Key;
     if (!key.cryptoKey) {
       goog.asserts.assert(key.fetchKey, 'If AES-128 cryptoKey was not ' +
           'preloaded, fetchKey function should be provided');
@@ -1818,10 +1814,10 @@ shaka.media.StreamingEngine = class {
       }
     }
 
-    const lastDiscontinuitySequence =
-        mediaState.lastSegmentReference ?
-            mediaState.lastSegmentReference.discontinuitySequence : null;
     if (this.manifest_.sequenceMode) {
+      const lastDiscontinuitySequence =
+          mediaState.lastSegmentReference ?
+              mediaState.lastSegmentReference.discontinuitySequence : null;
       // Across discontinuity bounds, we should resync timestamps for
       // sequence mode playbacks.  The next segment appended should
       // land at its theoretical timestamp from the segment index.
@@ -1831,18 +1827,6 @@ shaka.media.StreamingEngine = class {
         operations.push(this.playerInterface_.mediaSourceEngine.resync(
             mediaState.type, reference.startTime));
       }
-    } else if (this.manifest_.ignoreManifestTimestampsInSegmentsMode) {
-      // In segments mode, we need to resync to set the timestampOffset
-      // to the start of the current discontinuity sequence. This is
-      // because individual discontinuity sequences may have internal
-      // timestamps that overlap, so we adjust the timestampOffset to avoid
-      // having the SourceBuffer get overwritten.
-      if (reference.discontinuitySequence != lastDiscontinuitySequence) {
-        operations.push(
-            this.playerInterface_.mediaSourceEngine.resync(
-                mediaState.type,
-                reference.timestampOffset));
-      }
     }
 
     await Promise.all(operations);
@@ -2200,7 +2184,13 @@ shaka.media.StreamingEngine = class {
     mediaState.operation = op;
     const response = await op.promise;
     mediaState.operation = null;
-    return response.data;
+    let result = response.data;
+    if (reference.hlsAes128Key) {
+      const iter = mediaState.segmentIterator;
+      goog.asserts.assert(iter, 'mediaState.segmentIterator should exist');
+      result = await this.aes128Decrypt_(result, reference.hlsAes128Key, iter);
+    }
+    return result;
   }
 
   /**

package/lib/player.js

@@ -7175,7 +7175,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v4.4.2-uncompiled';
+shaka.Player.version = 'v4.4.3-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.