shaka-player 4.4.0 → 4.4.2

package/docs/tutorials/fairplay.md

@@ -232,3 +232,11 @@ player.getNetworkingEngine()
 player.configure('drm.initDataTransform',
                  FairPlayUtils.expressplayInitDataTransform);
 ```
+
+#### Nagra (legacy Apple Media Keys)
+
+For integration with Nagra the following can be used:
+
+```js
+shaka.polyfill.PatchedMediaKeysApple.install();
+```

package/docs/tutorials/faq.md

@@ -153,7 +153,7 @@ In other environments, for example Electron, it is appropriate.
 In those cases, before Shaka Player loads a manifest, you can register the
 existing http plugin for `file://` requests:
 ```js
-shaka.net.NetworkingEngine.registerScheme('file', shaka.net.HttpXHRPlugin);
+shaka.net.NetworkingEngine.registerScheme('file', shaka.net.HttpXHRPlugin.parse);
 ```
 
 <hr>

package/externs/shaka/namespace.js

@@ -6,8 +6,8 @@
 
 /**
  * @externs
- * @suppress {duplicate} To prevent compiler errors with the namespace
- *   being declared both here and by goog.provide in the library.
+ * @suppress {constantProperty, duplicate} To prevent compiler errors with the
+ *   namespace being declared both here and by goog.provide in the library.
  */
 
 /** @namespace */

package/externs/shaka/text.js

@@ -48,6 +48,13 @@ shaka.extern.TextParser = class {
    * @param {boolean} sequenceMode
    */
   setSequenceMode(sequenceMode) {}
+
+  /**
+   * Notifies the manifest type.
+   *
+   * @param {string} manifestType
+   */
+  setManifestType(manifestType) {}
 };
 
 

package/externs/shaka/transmuxer.js

@@ -46,9 +46,10 @@ shaka.extern.Transmuxer = class {
    * @param {?shaka.media.SegmentReference} reference The segment reference, or
    *   null for init segments
    * @param {number} duration
+   * @param {string} contentType
    * @return {!Promise.<!Uint8Array>}
    */
-  transmux(data, stream, reference, duration) {}
+  transmux(data, stream, reference, duration, contentType) {}
 };
 
 

package/lib/dash/segment_template.js

@@ -868,6 +868,9 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
           .unscaledPresentationTimeOffset + range.unscaledStart;
 
       const createUrisCb = () => {
+        if (!this.templateInfo_) {
+          return [];
+        }
         return shaka.dash.TimelineSegmentIndex
             .createUris_(
                 this.templateInfo_.mediaTemplate,

package/lib/hls/hls_parser.js

@@ -900,6 +900,7 @@ shaka.hls.HlsParser = class {
     const uint8ArrayData = shaka.util.BufferUtils.toUint8(response.data);
     const tsParser = new shaka.util.TsParser().parse(uint8ArrayData);
     const tsCodecs = tsParser.getCodecs();
+    const videoInfo = tsParser.getVideoInfo();
     const codecs = [];
     let hasAudio = false;
     let hasVideo = false;
@@ -923,7 +924,11 @@ shaka.hls.HlsParser = class {
     }
     switch (tsCodecs.video) {
       case 'avc':
-        codecs.push('avc1.42E01E');
+        if (videoInfo.codec) {
+          codecs.push(videoInfo.codec);
+        } else {
+          codecs.push('avc1.42E01E');
+        }
         hasVideo = true;
         break;
       case 'hvc':
@@ -935,14 +940,13 @@ shaka.hls.HlsParser = class {
       return null;
     }
     const onlyAudio = hasAudio && !hasVideo;
-    const videoResolution = tsParser.getVideoResolution();
     return {
       type: onlyAudio ? 'audio' : 'video',
       mimeType: 'video/mp2t',
       codecs: codecs.join(', '),
       language: null,
-      height: videoResolution.height,
-      width: videoResolution.width,
+      height: videoInfo.height,
+      width: videoInfo.width,
       channelCount: null,
       sampleRate: null,
     };
@@ -1466,6 +1470,7 @@ shaka.hls.HlsParser = class {
       // and no video codec, so it should be audio.
       type = ContentType.AUDIO;
       shaka.log.debug('Guessing audio-only.');
+      ignoreStream = res.audio.length > 0;
     } else if (!streamInfos.length && audioCodecs && videoCodecs) {
       // There are both audio and video codecs, so assume multiplexed content.
       // Note that the default used when CODECS is missing assumes multiple

package/lib/media/media_source_engine.js

@@ -492,7 +492,7 @@ shaka.media.MediaSourceEngine = class {
       this.textEngine_ = new shaka.text.TextEngine(this.textDisplayer_);
     }
     this.textEngine_.initParser(mimeType, sequenceMode,
-        external || this.segmentRelativeVttTiming_);
+        external || this.segmentRelativeVttTiming_, this.manifestType_);
   }
 
   /**
@@ -821,7 +821,7 @@ shaka.media.MediaSourceEngine = class {
 
     if (this.transmuxers_[contentType]) {
       data = await this.transmuxers_[contentType].transmux(
-          data, stream, reference, this.mediaSource_.duration);
+          data, stream, reference, this.mediaSource_.duration, contentType);
     }
 
     data = this.workAroundBrokenPlatforms_(
@@ -1562,16 +1562,34 @@ shaka.media.MediaSourceEngine = class {
    * @private
    */
   async reset_(streamsByType) {
+    const Functional = shaka.util.Functional;
     this.reloadingMediaSource_ = true;
     const currentTime = this.video_.currentTime;
     try {
       this.eventManager_.removeAll();
-      this.sourceBuffers_ = {};
 
       const cleanup = [];
       for (const contentType in this.transmuxers_) {
         cleanup.push(this.transmuxers_[contentType].destroy());
       }
+      for (const contentType in this.queues_) {
+        // Make a local copy of the queue and the first item.
+        const q = this.queues_[contentType];
+        const inProgress = q[0];
+
+        // Drop everything else out of the original queue.
+        this.queues_[contentType] = q.slice(0, 1);
+
+        // We will wait for this item to complete/fail.
+        if (inProgress) {
+          cleanup.push(inProgress.p.catch(Functional.noop));
+        }
+
+        // The rest will be rejected silently if possible.
+        for (const item of q.slice(1)) {
+          item.p.reject(shaka.util.Destroyer.destroyedError());
+        }
+      }
       for (const contentType in this.sourceBuffers_) {
         const sourceBuffer = this.sourceBuffers_[contentType];
         try {
@@ -1580,6 +1598,8 @@ shaka.media.MediaSourceEngine = class {
       }
       await Promise.all(cleanup);
       this.transmuxers_ = {};
+      this.queues_ = {};
+      this.sourceBuffers_ = {};
 
       const previousDuration = this.mediaSource_.duration;
       this.mediaSourceOpen_ = new shaka.util.PublicPromise();

package/lib/mss/mss_parser.js

@@ -635,6 +635,7 @@ shaka.mss.MssParser = class {
         const streamInfo = {
           id: stream.id,
           type: stream.type,
+          codecs: stream.codecs,
           encrypted: stream.encrypted,
           timescale: stream.mssPrivateData.timescale,
           duration: stream.mssPrivateData.duration,

package/lib/player.js

@@ -2663,16 +2663,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return;
     }
 
-    this.selectAudioLanguage(preferredAudioLanguage);
-
     const preferredVariantRole = this.config_.preferredVariantRole;
-
-    // If the user has not selected a role preference, the previous match is
-    // selected.
-    if (preferredVariantRole == '') {
-      return;
-    }
-
     this.selectAudioLanguage(preferredAudioLanguage, preferredVariantRole);
   }
 
@@ -2683,7 +2674,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    */
   setupPreferredTextOnSrc_() {
     const preferredTextLanguage = this.config_.preferredTextLanguage;
-    const preferForcedSubs = this.config_.preferForcedSubs;
 
     // If the user has not selected a preference, the browser preference is
     // left.
@@ -2691,16 +2681,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return;
     }
 
-    this.selectTextLanguage(preferredTextLanguage, '', preferForcedSubs);
-
+    const preferForcedSubs = this.config_.preferForcedSubs;
     const preferredTextRole = this.config_.preferredTextRole;
 
-    // If the user has not selected a role preference, the previous match is
-    // selected.
-    if (preferredTextRole == '') {
-      return;
-    }
-
     this.selectTextLanguage(preferredTextLanguage, preferredTextRole,
         preferForcedSubs);
   }
@@ -4199,8 +4182,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @export
    */
   selectAudioLanguage(language, role, channelsCount = 0, safeMargin = 0) {
-    const LanguageUtils = shaka.util.LanguageUtils;
-
     if (this.manifest_ && this.playhead_) {
       this.currentAdaptationSetCriteria_ =
           new shaka.media.PreferenceBasedCriteria(language, role || '',
@@ -4238,33 +4219,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // If we haven't switched yet, just use ABR to find a new track.
       this.chooseVariantAndSwitch_();
     } else if (this.video_ && this.video_.audioTracks) {
-      const audioTracks = Array.from(this.video_.audioTracks);
-      const selectedLanguage = LanguageUtils.normalize(language);
-
-      let languageMatch = null;
-      let languageAndRoleMatch = null;
-
-      for (const audioTrack of audioTracks) {
-        const track = shaka.util.StreamUtils.html5AudioTrackToTrack(audioTrack);
-
-        if (LanguageUtils.normalize(track.language) == selectedLanguage) {
-          languageMatch = audioTrack;
-
-          if (role) {
-            if (track.roles.includes(role)) {
-              languageAndRoleMatch = audioTrack;
-            }
-          } else {  // no role
-            if (track.roles.length == 0) {
-              languageAndRoleMatch = audioTrack;
-            }
-          }
-        }
-      }
-      if (languageAndRoleMatch) {
-        this.switchHtml5Track_(languageAndRoleMatch);
-      } else if (languageMatch) {
-        this.switchHtml5Track_(languageMatch);
+      const track = shaka.util.StreamUtils.filterStreamsByLanguageAndRole(
+          this.getVariantTracks(), language, role || '', false)[0];
+      if (track) {
+        this.selectVariantTrack(track);
       }
     }
   }
@@ -4280,8 +4238,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @export
    */
   selectTextLanguage(language, role, forced = false) {
-    const LanguageUtils = shaka.util.LanguageUtils;
-
     if (this.manifest_ && this.playhead_) {
       this.currentTextLanguage_ = language;
       this.currentTextRole_ = role || '';
@@ -4302,13 +4258,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         }
       }
     } else {
-      const selectedLanguage = LanguageUtils.normalize(language);
-
-      const track = this.getTextTracks().find((t) => {
-        return LanguageUtils.normalize(t.language) == selectedLanguage &&
-          (!role || t.roles.includes(role)) && t.forced == forced;
-      });
-
+      const track = shaka.util.StreamUtils.filterStreamsByLanguageAndRole(
+          this.getTextTracks(), language, role || '', forced)[0];
       if (track) {
         this.selectTextTrack(track);
       }
@@ -7224,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.0-uncompiled';
+shaka.Player.version = 'v4.4.2-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/text/lrc_text_parser.js

@@ -36,6 +36,14 @@ shaka.text.LrcTextParser = class {
     // Unused.
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setManifestType(manifestType) {
+    // Unused.
+  }
+
   /**
    * @override
    * @export

package/lib/text/mp4_ttml_parser.js

@@ -63,6 +63,14 @@ shaka.text.Mp4TtmlParser = class {
     // Unused.
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setManifestType(manifestType) {
+    // Unused.
+  }
+
   /**
    * @override
    * @export

package/lib/text/mp4_vtt_parser.js

@@ -92,6 +92,14 @@ shaka.text.Mp4VttParser = class {
     // Unused.
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setManifestType(manifestType) {
+    // Unused.
+  }
+
   /**
    * @override
    * @export

package/lib/text/sbv_text_parser.js

@@ -35,6 +35,14 @@ shaka.text.SbvTextParser = class {
     // Unused.
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setManifestType(manifestType) {
+    // Unused.
+  }
+
   /**
    * @override
    * @export

package/lib/text/simple_text_displayer.js

@@ -51,7 +51,6 @@ shaka.text.SimpleTextDisplayer = class {
       // kinds which can be displayed in the app's UI.
       this.textTrack_ = video.addTextTrack(
           'subtitles', shaka.Player.TextTrackLabel);
-      console.log(this.textTrack_);
     }
     this.textTrack_.mode = 'hidden';
   }

package/lib/text/srt_text_parser.js

@@ -43,6 +43,14 @@ shaka.text.SrtTextParser = class {
     // Unused.
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setManifestType(manifestType) {
+    // Unused.
+  }
+
   /**
    * @override
    * @export

package/lib/text/ssa_text_parser.js

@@ -36,6 +36,14 @@ shaka.text.SsaTextParser = class {
     // Unused.
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setManifestType(manifestType) {
+    // Unused.
+  }
+
   /**
    * @override
    * @export

package/lib/text/text_engine.js

@@ -132,8 +132,9 @@ shaka.text.TextEngine = class {
    * @param {string} mimeType
    * @param {boolean} sequenceMode
    * @param {boolean} segmentRelativeVttTiming
+   * @param {string} manifestType
    */
-  initParser(mimeType, sequenceMode, segmentRelativeVttTiming) {
+  initParser(mimeType, sequenceMode, segmentRelativeVttTiming, manifestType) {
     // No parser for CEA, which is extracted from video and side-loaded
     // into TextEngine and TextDisplayer.
     if (mimeType == shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE ||
@@ -152,6 +153,12 @@ shaka.text.TextEngine = class {
       shaka.log.alwaysWarn(
           'Text parsers should have a "setSequenceMode" method!');
     }
+    if (this.parser_.setManifestType) {
+      this.parser_.setManifestType(manifestType);
+    } else {
+      shaka.log.alwaysWarn(
+          'Text parsers should have a "setManifestType" method!');
+    }
     this.segmentRelativeVttTiming_ = segmentRelativeVttTiming;
   }
 

package/lib/text/ttml_text_parser.js

@@ -38,6 +38,14 @@ shaka.text.TtmlTextParser = class {
     // Unused.
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setManifestType(manifestType) {
+    // Unused.
+  }
+
   /**
    * @override
    * @export
@@ -214,11 +222,12 @@ shaka.text.TtmlTextParser = class {
       }
     }
 
-    const parentIsContent = isContent;
     if (cueNode.nodeName == 'p' || imageElement) {
       isContent = true;
     }
 
+    const parentIsContent = isContent;
+
     const spaceStyle = cueElement.getAttribute('xml:space') ||
         (whitespaceTrim ? 'default' : 'preserve');
 

package/lib/text/ui_text_displayer.js

@@ -481,6 +481,43 @@ shaka.text.UITextDisplayer = class {
     this.currentCuesMap_.set(cue, {cueElement, wrapper, regionElement});
   }
 
+  /**
+   * Compute cue position alignment
+   * See https://www.w3.org/TR/webvtt1/#webvtt-cue-position-alignment
+   *
+   * @param {!shaka.text.Cue} cue
+   * @private
+   */
+  computeCuePositionAlignment_(cue) {
+    const Cue = shaka.text.Cue;
+    const {direction, positionAlign, textAlign} = cue;
+
+    if (positionAlign !== Cue.positionAlign.AUTO) {
+      // Position align is not AUTO: use it
+      return positionAlign;
+    }
+
+    // Position align is AUTO: use text align to compute its value
+
+    if (textAlign === Cue.textAlign.LEFT ||
+      (textAlign === Cue.textAlign.START &&
+        direction === Cue.direction.HORIZONTAL_LEFT_TO_RIGHT) ||
+      (textAlign === Cue.textAlign.END &&
+        direction === Cue.direction.HORIZONTAL_RIGHT_TO_LEFT)) {
+      return Cue.positionAlign.LEFT;
+    }
+
+    if (textAlign === Cue.textAlign.RIGHT ||
+      (textAlign === Cue.textAlign.START &&
+        direction === Cue.direction.HORIZONTAL_RIGHT_TO_LEFT) ||
+      (textAlign === Cue.textAlign.END &&
+        direction === Cue.direction.HORIZONTAL_LEFT_TO_RIGHT)) {
+      return Cue.positionAlign.RIGHT;
+    }
+
+    return Cue.positionAlign.CENTER;
+  }
+
   /**
    * @param {!HTMLElement} cueElement
    * @param {!shaka.text.Cue} cue
@@ -617,7 +654,15 @@ shaka.text.UITextDisplayer = class {
     // TODO: Implement line alignment with line number.
     // TODO: Implement lineAlignment of 'CENTER'.
     if (cue.line != null) {
-      if (cue.lineInterpretation == Cue.lineInterpretation.PERCENTAGE) {
+      let lineInterpretation = cue.lineInterpretation;
+      // HACK: the current implementation of UITextDisplayer only handled
+      // PERCENTAGE, as cue.line=0 is zero, we can interpret it as percentage
+      // safely.
+      if (cue.line == 0 &&
+          lineInterpretation == Cue.lineInterpretation.LINE_NUMBER) {
+        lineInterpretation = Cue.lineInterpretation.PERCENTAGE;
+      }
+      if (lineInterpretation == Cue.lineInterpretation.PERCENTAGE) {
         style.position = 'absolute';
         if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
           style.width = '100%';
@@ -658,9 +703,10 @@ shaka.text.UITextDisplayer = class {
 
     // The positionAlign attribute is an alignment for the text container in
     // the dimension of the writing direction.
-    if (cue.positionAlign == Cue.positionAlign.LEFT) {
+    const computedPositionAlign = this.computeCuePositionAlignment_(cue);
+    if (computedPositionAlign == Cue.positionAlign.LEFT) {
       style.cssFloat = 'left';
-    } else if (cue.positionAlign == Cue.positionAlign.RIGHT) {
+    } else if (computedPositionAlign == Cue.positionAlign.RIGHT) {
       style.cssFloat = 'right';
     }
 

package/lib/text/vtt_text_parser.js

@@ -8,6 +8,7 @@ goog.provide('shaka.text.VttTextParser');
 
 goog.require('goog.asserts');
 goog.require('shaka.log');
+goog.require('shaka.media.ManifestParser');
 goog.require('shaka.text.Cue');
 goog.require('shaka.text.CueRegion');
 goog.require('shaka.text.TextEngine');
@@ -26,6 +27,9 @@ shaka.text.VttTextParser = class {
   constructor() {
     /** @private {boolean} */
     this.sequenceMode_ = false;
+
+    /** @private {string} */
+    this.manifestType_ = shaka.media.ManifestParser.UNKNOWN;
   }
 
   /**
@@ -44,6 +48,14 @@ shaka.text.VttTextParser = class {
     this.sequenceMode_ = sequenceMode;
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setManifestType(manifestType) {
+    this.manifestType_ = manifestType;
+  }
+
   /**
    * @override
    * @export
@@ -72,10 +84,9 @@ shaka.text.VttTextParser = class {
     // HLS content, which should use X-TIMESTAMP-MAP and periodStart instead.
     let offset = time.vttOffset;
 
-    // Only use 'X-TIMESTAMP-MAP' in sequence mode, as that is currently
-    // shorthand for HLS.  Note that an offset based on the first video
+    // Only use 'X-TIMESTAMP-MAP' in sequence mode.
+    // Note that an offset based on the first video
     // timestamp has already been extracted, and appears in periodStart.
-    // The relative offset from X-TIMESTAMP-MAP will be added to that for HLS.
     if (blocks[0].includes('X-TIMESTAMP-MAP') && this.sequenceMode_) {
       // https://bit.ly/2K92l7y
       // The 'X-TIMESTAMP-MAP' header is used in HLS to align text with
@@ -113,6 +124,11 @@ shaka.text.VttTextParser = class {
 
         offset = time.periodStart + mpegTime / mpegTimescale - cueTime;
       }
+    } else if (blocks[0].includes('X-TIMESTAMP-MAP') &&
+        this.manifestType_ == shaka.media.ManifestParser.HLS) {
+      // In we use HLS segments mode, with the presence of this tag we need
+      // calculate the offset from the segment startTime.
+      offset = time.segmentStart;
     }
 
     // Parse VTT regions.
@@ -401,8 +417,6 @@ shaka.text.VttTextParser = class {
       cue = new shaka.text.Cue(start, end, '');
     }
 
-    VttTextParser.parseCueStyles(payload, cue, styles);
-
     // Parse optional settings.
     parser.skipWhitespace();
     let word = parser.readWord();
@@ -416,6 +430,8 @@ shaka.text.VttTextParser = class {
       word = parser.readWord();
     }
 
+    VttTextParser.parseCueStyles(payload, cue, styles);
+
     if (id != null) {
       cue.id = id;
     }

package/lib/transmuxer/aac_transmuxer.js

@@ -145,7 +145,6 @@ shaka.transmuxer.AacTransmuxer = class {
     }
     stream.audioSamplingRate = info.sampleRate;
     stream.channelsCount = info.channelCount;
-    stream.codecs = info.codec;
 
     /** @type {!Array.<shaka.util.Mp4Generator.Mp4Sample>} */
     const samples = [];
@@ -189,6 +188,7 @@ shaka.transmuxer.AacTransmuxer = class {
     const streamInfo = {
       id: stream.id,
       type: shaka.util.ManifestParserUtils.ContentType.AUDIO,
+      codecs: info.codec,
       encrypted: stream.encrypted && stream.drmInfos.length > 0,
       timescale: sampleRate,
       duration: duration,

package/lib/transmuxer/ac3_transmuxer.js

@@ -177,6 +177,7 @@ shaka.transmuxer.Ac3Transmuxer = class {
     const streamInfo = {
       id: stream.id,
       type: shaka.util.ManifestParserUtils.ContentType.AUDIO,
+      codecs: 'ac-3',
       encrypted: stream.encrypted && stream.drmInfos.length > 0,
       timescale: sampleRate,
       duration: duration,

package/lib/transmuxer/ec3_transmuxer.js

@@ -177,6 +177,7 @@ shaka.transmuxer.Ec3Transmuxer = class {
     const streamInfo = {
       id: stream.id,
       type: shaka.util.ManifestParserUtils.ContentType.AUDIO,
+      codecs: 'ec-3',
       encrypted: stream.encrypted && stream.drmInfos.length > 0,
       timescale: sampleRate,
       duration: duration,

package/lib/transmuxer/mp3_transmuxer.js

@@ -169,6 +169,7 @@ shaka.transmuxer.Mp3Transmuxer = class {
     const streamInfo = {
       id: stream.id,
       type: shaka.util.ManifestParserUtils.ContentType.AUDIO,
+      codecs: 'mp3',
       encrypted: stream.encrypted && stream.drmInfos.length > 0,
       timescale: sampleRate,
       duration: duration,