shaka-player 4.11.13 → 4.12.1

package/lib/dash/content_protection.js

@@ -11,6 +11,7 @@ goog.require('shaka.log');
 goog.require('shaka.util.BufferUtils');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.ManifestParserUtils');
+goog.require('shaka.util.Platform');
 goog.require('shaka.util.Pssh');
 goog.require('shaka.util.StringUtils');
 goog.require('shaka.util.TXml');
@@ -194,6 +195,34 @@ shaka.dash.ContentProtection = class {
     return repContext.defaultKeyId || context.defaultKeyId;
   }
 
+  /**
+   * Gets a FairPlay license URL from a content protection element
+   * containing a 'dashif:Laurl' element
+   *
+   * @param {shaka.dash.ContentProtection.Element} element
+   * @return {string}
+   */
+  static getFairPlayLicenseUrl(element) {
+    if (shaka.util.Platform.isMediaKeysPolyfilled()) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.MANIFEST,
+          shaka.util.Error.Code
+              .DASH_MSE_ENCRYPTED_LEGACY_APPLE_MEDIA_KEYS_NOT_SUPPORTED);
+    }
+    const dashIfLaurlNode = shaka.util.TXml.findChildNS(
+        element.node, shaka.dash.ContentProtection.DashIfNamespaceUri_,
+        'Laurl',
+    );
+    if (dashIfLaurlNode) {
+      const textContents = shaka.util.TXml.getTextContents(dashIfLaurlNode);
+      if (textContents) {
+        return textContents;
+      }
+    }
+    return '';
+  }
+
   /**
    * Gets a Widevine license URL from a content protection element
    * containing a custom `ms:laurl` or 'dashif:Laurl' elements
@@ -793,6 +822,8 @@ shaka.dash.ContentProtection.Element;
  * @private
  */
 shaka.dash.ContentProtection.licenseUrlParsers_ = new Map()
+    .set('com.apple.fps',
+        shaka.dash.ContentProtection.getFairPlayLicenseUrl)
     .set('com.widevine.alpha',
         shaka.dash.ContentProtection.getWidevineLicenseUrl)
     .set('com.microsoft.playready',

package/lib/dash/dash_parser.js

@@ -681,7 +681,6 @@ shaka.dash.DashParser = class {
     }
 
     this.manifestPatchContext_.type = mpdType;
-    this.cleanStreamMap_();
     /** @type {!shaka.media.PresentationTimeline} */
     let presentationTimeline;
     if (this.manifest_) {
@@ -858,6 +857,8 @@ shaka.dash.DashParser = class {
     // after period combining, while we still have a direct reference, so that
     // any new streams will appear in the period combiner.
     this.playerInterface_.makeTextStreamsForClosedCaptions(this.manifest_);
+
+    this.cleanStreamMap_();
   }
 
   /**
@@ -1501,13 +1502,21 @@ shaka.dash.DashParser = class {
       return !this.lastManifestUpdatePeriodIds_.includes(pId);
     });
     for (const pId of diffPeriodsIDs) {
+      let shouldDeleteIndex = true;
       for (const contextId of this.indexStreamMap_[pId]) {
+        const stream = this.streamMap_[contextId];
+        if (stream.segmentIndex && !stream.segmentIndex.isEmpty()) {
+          shouldDeleteIndex = false;
+          continue;
+        }
         if (this.periodCombiner_) {
           this.periodCombiner_.deleteStream(this.streamMap_[contextId], pId);
         }
         delete this.streamMap_[contextId];
       }
-      delete this.indexStreamMap_[pId];
+      if (shouldDeleteIndex) {
+        delete this.indexStreamMap_[pId];
+      }
     }
   }
 
@@ -1597,13 +1606,15 @@ shaka.dash.DashParser = class {
         .filter((as) => { return as.trickModeFor; });
 
     // Attach trick mode tracks to normal tracks.
-    for (const trickModeSet of trickModeAdaptationSets) {
-      const targetIds = trickModeSet.trickModeFor.split(' ');
-      for (const normalSet of normalAdaptationSets) {
-        if (targetIds.includes(normalSet.id)) {
-          for (const stream of normalSet.streams) {
-            shaka.util.StreamUtils.setBetterIFrameStream(
-                stream, trickModeSet.streams);
+    if (!this.config_.disableIFrames) {
+      for (const trickModeSet of trickModeAdaptationSets) {
+        const targetIds = trickModeSet.trickModeFor.split(' ');
+        for (const normalSet of normalAdaptationSets) {
+          if (targetIds.includes(normalSet.id)) {
+            for (const stream of normalSet.streams) {
+              shaka.util.StreamUtils.setBetterIFrameStream(
+                  stream, trickModeSet.streams);
+            }
           }
         }
       }
@@ -2023,9 +2034,7 @@ shaka.dash.DashParser = class {
             new Set([...drmInfo.keyIds, ...stream.keyIds]) :
             drmInfo.keyIds || stream.keyIds;
       }
-      if (this.config_.dash.enableAudioGroups) {
-        stream.groupId = adaptationId;
-      }
+      stream.groupId = adaptationId;
     }
 
     const repIds = representations
@@ -2384,6 +2393,7 @@ shaka.dash.DashParser = class {
         fastSwitching: false,
         fullMimeTypes: new Set([shaka.util.MimeUtils.getFullType(
             context.representation.mimeType, context.representation.codecs)]),
+        isAudioMuxedInVideo: false,
       };
     }
 

package/lib/hls/hls_parser.js

@@ -293,6 +293,9 @@ shaka.hls.HlsParser = class {
    * @exportInterface
    */
   configure(config, isPreloadFn) {
+    const needFireUpdate = this.playerInterface_ &&
+      config.hls.updatePeriod != this.config_.hls.updatePeriod &&
+      config.hls.updatePeriod >= 0;
     this.config_ = config;
     if (isPreloadFn) {
       this.isPreloadFn_ = isPreloadFn;
@@ -301,6 +304,11 @@ shaka.hls.HlsParser = class {
     if (this.contentSteeringManager_) {
       this.contentSteeringManager_.configure(this.config_);
     }
+
+    if (needFireUpdate && this.manifest_ &&
+      this.manifest_.presentationTimeline.isLive()) {
+      this.updatePlaylistTimer_.tickNow();
+    }
   }
 
   /**
@@ -420,7 +428,8 @@ shaka.hls.HlsParser = class {
     // problem in the live encoder for example), and disable the stream if
     // necessary.
     for (const streamInfo of activeStreamInfos) {
-      if (streamInfo.stream.segmentIndex &&
+      if (!streamInfo.stream.isAudioMuxedInVideo &&
+          streamInfo.stream.segmentIndex &&
           !streamInfo.stream.segmentIndex.earliestReference()) {
         this.playerInterface_.disableStream(streamInfo.stream);
       }
@@ -448,6 +457,9 @@ shaka.hls.HlsParser = class {
    * @private
    */
   async updateStream_(streamInfo) {
+    if (streamInfo.stream.isAudioMuxedInVideo) {
+      return;
+    }
     const manifestUris = [];
     for (const uri of streamInfo.getUris()) {
       const uriObj = new goog.Uri(uri);
@@ -1491,11 +1503,11 @@ shaka.hls.HlsParser = class {
    * @private
    */
   createStreamInfosFromMediaTags_(mediaTags, groupIdPathwayIdMapping) {
-    // Filter out subtitles and  media tags without uri.
+    // Filter out subtitles and media tags without uri (except audio).
     mediaTags = mediaTags.filter((tag) => {
       const uri = tag.getAttributeValue('URI') || '';
       const type = tag.getAttributeValue('TYPE');
-      return type != 'SUBTITLES' && uri != '';
+      return type != 'SUBTITLES' && (uri != '' || type == 'AUDIO');
     });
 
     const groupedTags = {};
@@ -1511,7 +1523,7 @@ shaka.hls.HlsParser = class {
     for (const key in groupedTags) {
       // Create stream info for each audio / video media grouped tag.
       this.createStreamInfoFromMediaTags_(
-          groupedTags[key], groupIdPathwayIdMapping);
+          groupedTags[key], groupIdPathwayIdMapping, /* requireUri= */ false);
     }
   }
 
@@ -1781,32 +1793,8 @@ shaka.hls.HlsParser = class {
     }
 
     if (!ignoreStream) {
-      let language = null;
-      let name = null;
-      let channelsCount = null;
-      let spatialAudio = false;
-      let characteristics = null;
-      let sampleRate = null;
-      if (!streamInfos.length) {
-        const mediaTag = mediaTags.find((tag) => {
-          const uri = tag.getAttributeValue('URI') || '';
-          const type = tag.getAttributeValue('TYPE');
-          const groupId = tag.getRequiredAttrValue('GROUP-ID');
-          return type != 'SUBTITLES' && uri == '' &&
-              globalGroupIds.includes(groupId);
-        });
-        if (mediaTag) {
-          language = mediaTag.getAttributeValue('LANGUAGE');
-          name = mediaTag.getAttributeValue('NAME');
-          channelsCount = this.getChannelsCount_(mediaTag);
-          spatialAudio = this.isSpatialAudio_(mediaTag);
-          characteristics = mediaTag.getAttributeValue('CHARACTERISTICS');
-          sampleRate = this.getSampleRate_(mediaTag);
-        }
-      }
-      const streamInfo = this.createStreamInfoFromVariantTags_(
-          tags, allCodecs, type, language, name, channelsCount,
-          characteristics, sampleRate, spatialAudio);
+      const streamInfo =
+          this.createStreamInfoFromVariantTags_(tags, allCodecs, type);
       if (globalGroupId) {
         streamInfo.stream.groupId = globalGroupId;
       }
@@ -2035,8 +2023,10 @@ shaka.hls.HlsParser = class {
         if (videoStream) {
           videoStream.drmInfos = drmInfos;
           videoStream.keyIds = keyIds;
-          shaka.util.StreamUtils.setBetterIFrameStream(
-              videoStream, iFrameStreams);
+          if (!this.config_.disableIFrames) {
+            shaka.util.StreamUtils.setBetterIFrameStream(
+                videoStream, iFrameStreams);
+          }
         }
         if (videoStream && !audioStream) {
           videoStream.bandwidth = bandwidth;
@@ -2140,17 +2130,20 @@ shaka.hls.HlsParser = class {
    *
    * @param {!Array.<!shaka.hls.Tag>} tags
    * @param {!Map.<string, string>} groupIdPathwayIdMapping
+   * @param {boolean=} requireUri
    * @return {!shaka.hls.HlsParser.StreamInfo}
    * @private
    */
-  createStreamInfoFromMediaTags_(tags, groupIdPathwayIdMapping) {
+  createStreamInfoFromMediaTags_(tags, groupIdPathwayIdMapping,
+      requireUri = true) {
     const verbatimMediaPlaylistUris = [];
     const globalGroupIds = [];
     const groupIdUriMappping = new Map();
     for (const tag of tags) {
       goog.asserts.assert(tag.name == 'EXT-X-MEDIA',
           'Should only be called on media tags!');
-      const uri = tag.getRequiredAttrValue('URI');
+      const uri = requireUri ? tag.getRequiredAttrValue('URI') :
+          (tag.getAttributeValue('URI') || shaka.hls.HlsParser.FAKE_MUXED_URL_);
       const groupId = tag.getRequiredAttrValue('GROUP-ID');
       verbatimMediaPlaylistUris.push(uri);
       globalGroupIds.push(groupId);
@@ -2350,17 +2343,10 @@ shaka.hls.HlsParser = class {
    * @param {!Array.<!shaka.hls.Tag>} tags
    * @param {!Array.<string>} allCodecs
    * @param {string} type
-   * @param {?string} language
-   * @param {?string} name
-   * @param {?number} channelsCount
-   * @param {?string} characteristics
-   * @param {?number} sampleRate
-   * @param {boolean} spatialAudio
    * @return {!shaka.hls.HlsParser.StreamInfo}
    * @private
    */
-  createStreamInfoFromVariantTags_(tags, allCodecs, type, language, name,
-      channelsCount, characteristics, sampleRate, spatialAudio) {
+  createStreamInfoFromVariantTags_(tags, allCodecs, type) {
     const streamId = this.globalId_++;
     const verbatimMediaPlaylistUris = [];
     for (const tag of tags) {
@@ -2382,10 +2368,11 @@ shaka.hls.HlsParser = class {
     const closedCaptions = this.getClosedCaptions_(tags[0], type);
     const codecs = shaka.util.ManifestParserUtils.guessCodecs(type, allCodecs);
     const streamInfo = this.createStreamInfo_(
-        streamId, verbatimMediaPlaylistUris, codecs, type, language,
-        /* primary= */ false, name, channelsCount, closedCaptions,
-        characteristics, /* forced= */ false, sampleRate,
-        /* spatialAudio= */ false);
+        streamId, verbatimMediaPlaylistUris,
+        codecs, type, /* language= */ null, /* primary= */ false,
+        /* name= */ null, /* channelcount= */ null, closedCaptions,
+        /* characteristics= */ null, /* forced= */ false,
+        /* sampleRate= */ null, /* spatialAudio= */ false);
 
     this.uriToStreamInfosMap_.set(key, streamInfo);
     return streamInfo;
@@ -2421,6 +2408,15 @@ shaka.hls.HlsParser = class {
         languageValue, primary, name, channelsCount, closedCaptions,
         characteristics, forced, sampleRate, spatialAudio);
 
+    const FAKE_MUXED_URL_ = shaka.hls.HlsParser.FAKE_MUXED_URL_;
+    if (verbatimMediaPlaylistUris.includes(FAKE_MUXED_URL_)) {
+      stream.isAudioMuxedInVideo = true;
+      // We assigned the TS mimetype because it is the only one that works
+      // with this functionality. MP4 is not supported right now.
+      stream.mimeType = 'video/mp2t';
+      this.setFullTypeForStream_(stream);
+    }
+
     const redirectUris = [];
     const getUris = () => {
       if (this.contentSteeringManager_ &&
@@ -2664,6 +2660,12 @@ shaka.hls.HlsParser = class {
         return creationPromise;
       }
 
+      if (stream.isAudioMuxedInVideo) {
+        const segmentIndex = new shaka.media.SegmentIndex([]);
+        stream.segmentIndex = segmentIndex;
+        return Promise.resolve();
+      }
+
       // Create a new PendingRequest to be able to cancel this specific
       // download.
       pendingRequest = this.requestManifest_(streamInfo.getUris(),
@@ -2704,7 +2706,8 @@ shaka.hls.HlsParser = class {
   getMinDuration_() {
     let minDuration = Infinity;
     for (const streamInfo of this.uriToStreamInfosMap_.values()) {
-      if (streamInfo.stream.segmentIndex && streamInfo.stream.type != 'text') {
+      if (streamInfo.stream.segmentIndex && streamInfo.stream.type != 'text' &&
+          !streamInfo.stream.isAudioMuxedInVideo) {
         // Since everything is already offset to 0 (either by sync or by being
         // VOD), only maxTimestamp is necessary to compute the duration.
         minDuration = Math.min(minDuration, streamInfo.maxTimestamp);
@@ -2721,7 +2724,8 @@ shaka.hls.HlsParser = class {
     let maxTimestamp = Infinity;
     let minTimestamp = Infinity;
     for (const streamInfo of this.uriToStreamInfosMap_.values()) {
-      if (streamInfo.stream.segmentIndex && streamInfo.stream.type != 'text') {
+      if (streamInfo.stream.segmentIndex && streamInfo.stream.type != 'text' &&
+          !streamInfo.stream.isAudioMuxedInVideo) {
         maxTimestamp = Math.min(maxTimestamp, streamInfo.maxTimestamp);
         minTimestamp = Math.min(minTimestamp, streamInfo.minTimestamp);
       }
@@ -3117,6 +3121,7 @@ shaka.hls.HlsParser = class {
       external: false,
       fastSwitching: false,
       fullMimeTypes: new Set(),
+      isAudioMuxedInVideo: false,
     };
     this.setFullTypeForStream_(stream);
     return stream;
@@ -4590,7 +4595,8 @@ shaka.hls.HlsParser = class {
       if (this.isLive_()) {
         const updateDuration = (endTime - startTime) / 1000.0;
         this.averageUpdateDuration_.sample(1, updateDuration);
-        const delay = this.getUpdatePlaylistDelay_();
+        const delay = this.config_.hls.updatePeriod > 0 ?
+            this.config_.hls.updatePeriod : this.getUpdatePlaylistDelay_();
         const finalDelay = Math.max(0,
             delay - this.averageUpdateDuration_.getEstimate());
         this.updatePlaylistTimer_.tickAfter(/* seconds= */ finalDelay);
@@ -5154,6 +5160,14 @@ shaka.hls.HlsParser.PresentationType_ = {
   LIVE: 'LIVE',
 };
 
+
+/**
+ * @const {string}
+ * @private
+ */
+shaka.hls.HlsParser.FAKE_MUXED_URL_ = 'shaka://hls-muxed';
+
+
 shaka.media.ManifestParser.registerParserByMime(
     'application/x-mpegurl', () => new shaka.hls.HlsParser());
 shaka.media.ManifestParser.registerParserByMime(

package/lib/media/adaptation_set.js

@@ -27,10 +27,8 @@ shaka.media.AdaptationSet = class {
    *    compatible. If a candidate is not compatible, it will not end up in the
    *    adaptation set.
    * @param {boolean=} compareCodecs
-   * @param {boolean=} enableAudioGroups
    */
-  constructor(root, candidates, compareCodecs = true,
-      enableAudioGroups = false) {
+  constructor(root, candidates, compareCodecs = true) {
     /** @private {shaka.extern.Variant} */
     this.root_ = root;
     /** @private {!Set.<shaka.extern.Variant>} */
@@ -40,18 +38,17 @@ shaka.media.AdaptationSet = class {
     // are not compatible with the root, they will be rejected by |add|.
     candidates = candidates || [];
     for (const candidate of candidates) {
-      this.add(candidate, compareCodecs, enableAudioGroups);
+      this.add(candidate, compareCodecs);
     }
   }
 
   /**
    * @param {shaka.extern.Variant} variant
    * @param {boolean} compareCodecs
-   * @param {boolean} enableAudioGroups
    * @return {boolean}
    */
-  add(variant, compareCodecs, enableAudioGroups) {
-    if (this.canInclude(variant, compareCodecs, enableAudioGroups)) {
+  add(variant, compareCodecs) {
+    if (this.canInclude(variant, compareCodecs)) {
       this.variants_.add(variant);
       return true;
     }
@@ -68,22 +65,20 @@ shaka.media.AdaptationSet = class {
    *
    * @param {shaka.extern.Variant} variant
    * @param {boolean=} compareCodecs
-   * @param {boolean=} enableAudioGroups
    * @return {boolean}
    */
-  canInclude(variant, compareCodecs = true, enableAudioGroups = false) {
+  canInclude(variant, compareCodecs = true) {
     return shaka.media.AdaptationSet
-        .areAdaptable(this.root_, variant, compareCodecs, enableAudioGroups);
+        .areAdaptable(this.root_, variant, compareCodecs);
   }
 
   /**
    * @param {shaka.extern.Variant} a
    * @param {shaka.extern.Variant} b
    * @param {boolean} compareCodecs
-   * @param {boolean} enableAudioGroups
    * @return {boolean}
    */
-  static areAdaptable(a, b, compareCodecs, enableAudioGroups) {
+  static areAdaptable(a, b, compareCodecs) {
     const AdaptationSet = shaka.media.AdaptationSet;
 
     // All variants should have audio or should all not have audio.
@@ -104,8 +99,8 @@ shaka.media.AdaptationSet = class {
     goog.asserts.assert(
         !!a.audio == !!b.audio,
         'Both should either have audio or not have audio.');
-    if (a.audio && b.audio && !AdaptationSet.areAudiosCompatible_(
-        a.audio, b.audio, compareCodecs, enableAudioGroups)) {
+    if (a.audio && b.audio &&
+        !AdaptationSet.areAudiosCompatible_(a.audio, b.audio, compareCodecs)) {
       return false;
     }
 
@@ -133,11 +128,10 @@ shaka.media.AdaptationSet = class {
    * @param {shaka.extern.Stream} a
    * @param {shaka.extern.Stream} b
    * @param {boolean} compareCodecs
-   * @param {boolean} enableAudioGroups
    * @return {boolean}
    * @private
    */
-  static areAudiosCompatible_(a, b, compareCodecs, enableAudioGroups) {
+  static areAudiosCompatible_(a, b, compareCodecs) {
     const AdaptationSet = shaka.media.AdaptationSet;
 
     // Don't adapt between channel counts, which could annoy the user
@@ -167,7 +161,7 @@ shaka.media.AdaptationSet = class {
     }
 
     // We can only adapt between the same groupId.
-    if (enableAudioGroups && a.groupId !== b.groupId) {
+    if (a.groupId !== b.groupId) {
       return false;
     }
 

package/lib/media/adaptation_set_criteria.js

@@ -42,9 +42,8 @@ shaka.media.ExampleBasedCriteria = class {
   /**
    * @param {shaka.extern.Variant} example
    * @param {shaka.config.CodecSwitchingStrategy} codecSwitchingStrategy
-   * @param {boolean} enableAudioGroups
    */
-  constructor(example, codecSwitchingStrategy, enableAudioGroups) {
+  constructor(example, codecSwitchingStrategy) {
     // We can't know if role and label are really important, so we don't use
     // role and label for this.
     const role = '';
@@ -65,7 +64,7 @@ shaka.media.ExampleBasedCriteria = class {
     this.preferenceBasedCriteria_ = new shaka.media.PreferenceBasedCriteria(
         example.language, role, channelCount, hdrLevel, spatialAudio,
         videoLayout, audioLabel, videoLabel,
-        codecSwitchingStrategy, enableAudioGroups, audioCodec);
+        codecSwitchingStrategy, audioCodec);
   }
 
   /** @override */
@@ -90,12 +89,10 @@ shaka.media.PreferenceBasedCriteria = class {
    * @param {string} audioLabel
    * @param {string} videoLabel
    * @param {shaka.config.CodecSwitchingStrategy} codecSwitchingStrategy
-   * @param {boolean} enableAudioGroups
    * @param {string} audioCodec
    */
   constructor(language, role, channelCount, hdrLevel, spatialAudio,
-      videoLayout, audioLabel, videoLabel, codecSwitchingStrategy,
-      enableAudioGroups, audioCodec) {
+      videoLayout, audioLabel, videoLabel, codecSwitchingStrategy, audioCodec) {
     /** @private {string} */
     this.language_ = language;
     /** @private {string} */
@@ -114,8 +111,6 @@ shaka.media.PreferenceBasedCriteria = class {
     this.videoLabel_ = videoLabel;
     /** @private {shaka.config.CodecSwitchingStrategy} */
     this.codecSwitchingStrategy_ = codecSwitchingStrategy;
-    /** @private {boolean} */
-    this.enableAudioGroups_ = enableAudioGroups;
     /** @private {string} */
     this.audioCodec_ = audioCodec;
   }
@@ -222,7 +217,7 @@ shaka.media.PreferenceBasedCriteria = class {
         shaka.media.Capabilities.isChangeTypeSupported();
 
     return new shaka.media.AdaptationSet(current[0], current,
-        !supportsSmoothCodecTransitions, this.enableAudioGroups_);
+        !supportsSmoothCodecTransitions);
   }
 
   /**

package/lib/media/drm_engine.js

@@ -179,7 +179,9 @@ shaka.media.DrmEngine = class {
       // Webkit EME implementation requires the src to be defined to clear
       // the MediaKeys.
       if (!shaka.util.Platform.isMediaKeysPolyfilled('webkit')) {
-        goog.asserts.assert(!this.video_.src,
+        goog.asserts.assert(
+            !this.video_.src &&
+            !this.video_.getElementsByTagName('source').length,
             'video src must be removed first!');
       }
 

package/lib/media/manifest_filterer.js

@@ -56,7 +56,8 @@ shaka.media.ManifestFilterer = class {
           manifest,
           this.config_.preferredVideoCodecs,
           this.config_.preferredAudioCodecs,
-          this.config_.preferredDecodingAttributes);
+          this.config_.preferredDecodingAttributes,
+          this.config_.preferredTextFormats);
     }
     this.checkPlayableVariants_(manifest);
     return this.filterManifestWithRestrictions(manifest);