shaka-player 4.9.6 → 4.9.8

package/lib/media/drm_engine.js

@@ -1793,6 +1793,7 @@ shaka.media.DrmEngine = class {
       'org.w3.clearkey',
       'com.widevine.alpha',
       'com.microsoft.playready',
+      'com.microsoft.playready.hardware',
       'com.microsoft.playready.recommendation',
       'com.chromecast.playready',
       'com.apple.fps.1_0',
@@ -1815,9 +1816,7 @@ shaka.media.DrmEngine = class {
 
     const testRobustness = {
       'com.widevine.alpha': widevineRobustness,
-      'com.microsoft.playready': playreadyRobustness,
       'com.microsoft.playready.recommendation': playreadyRobustness,
-      'com.chromecast.playready': playreadyRobustness,
     };
 
     const basicVideoCapabilities = [

package/lib/media/playhead.js

@@ -110,19 +110,26 @@ shaka.media.SrcEqualsPlayhead = class {
     // We listen for the loaded-data-event so that we know when we can
     // interact with |currentTime|.
     const onLoaded = () => {
-      if (this.startTime_ == null || this.startTime_ == 0) {
+      if (this.startTime_ == null ||
+          (this.startTime_ == 0 && this.mediaElement_.duration != Infinity)) {
         this.started_ = true;
       } else {
-        // Startup is complete only when the video element acknowledges the
-        // seek.
-        this.eventManager_.listenOnce(this.mediaElement_, 'seeking', () => {
-          this.started_ = true;
-        });
-
         const currentTime = this.mediaElement_.currentTime;
+        let newTime = this.startTime_;
         // Using the currentTime allows using a negative number in Live HLS
-        const newTime = Math.max(0, currentTime + this.startTime_);
-        this.mediaElement_.currentTime = newTime;
+        if (this.startTime_ < 0) {
+          newTime = Math.max(0, currentTime + this.startTime_);
+        }
+        if (currentTime != newTime) {
+          // Startup is complete only when the video element acknowledges the
+          // seek.
+          this.eventManager_.listenOnce(this.mediaElement_, 'seeking', () => {
+            this.started_ = true;
+          });
+          this.mediaElement_.currentTime = newTime;
+        } else {
+          this.started_ = true;
+        }
       }
     };
 

package/lib/media/segment_utils.js

@@ -179,6 +179,7 @@ shaka.media.SegmentUtils = class {
           break;
         case 'ac-3':
         case 'ec-3':
+        case 'ac-4':
         case 'opus':
         case 'flac':
           audioCodecs.push(codecLC);
@@ -207,6 +208,19 @@ shaka.media.SegmentUtils = class {
     /** @type {?string} */
     let baseBox;
 
+    const genericAudioBox = (box) => {
+      const parsedAudioSampleEntryBox =
+          shaka.util.Mp4BoxParsers.audioSampleEntry(box.reader);
+      channelCount = parsedAudioSampleEntryBox.channelCount;
+      sampleRate = parsedAudioSampleEntryBox.sampleRate;
+      codecBoxParser(box);
+    };
+
+    const genericVideoBox = (box) => {
+      baseBox = box.name;
+      Mp4Parser.visualSampleEntry(box);
+    };
+
     new Mp4Parser()
         .box('moov', Mp4Parser.children)
         .box('trak', Mp4Parser.children)
@@ -235,9 +249,10 @@ shaka.media.SegmentUtils = class {
         // AUDIO
         // These are the various boxes that signal a codec.
         .box('mp4a', (box) => {
-          const parsedMP4ABox = shaka.util.Mp4BoxParsers.parseMP4A(box.reader);
-          channelCount = parsedMP4ABox.channelCount;
-          sampleRate = parsedMP4ABox.sampleRate;
+          const parsedAudioSampleEntryBox =
+              shaka.util.Mp4BoxParsers.audioSampleEntry(box.reader);
+          channelCount = parsedAudioSampleEntryBox.channelCount;
+          sampleRate = parsedAudioSampleEntryBox.sampleRate;
           if (box.reader.hasMoreData()) {
             Mp4Parser.children(box);
           } else {
@@ -249,54 +264,24 @@ shaka.media.SegmentUtils = class {
           audioCodecs.push(parsedESDSBox.codec);
           hasAudio = true;
         })
-        .box('ac-3', codecBoxParser)
-        .box('ec-3', codecBoxParser)
-        .box('opus', codecBoxParser)
-        .box('Opus', codecBoxParser)
-        .box('fLaC', codecBoxParser)
+        .box('ac-3', genericAudioBox)
+        .box('ec-3', genericAudioBox)
+        .box('ac-4', genericAudioBox)
+        .box('Opus', genericAudioBox)
+        .box('fLaC', genericAudioBox)
 
         // VIDEO
         // These are the various boxes that signal a codec.
-        .box('avc1', (box) => {
-          baseBox = box.name;
-          Mp4Parser.visualSampleEntry(box);
-        })
-        .box('avc3', (box) => {
-          baseBox = box.name;
-          Mp4Parser.visualSampleEntry(box);
-        })
-        .box('hev1', (box) => {
-          baseBox = box.name;
-          Mp4Parser.visualSampleEntry(box);
-        })
-        .box('hvc1', (box) => {
-          baseBox = box.name;
-          Mp4Parser.visualSampleEntry(box);
-        })
-        .box('dva1', (box) => {
-          baseBox = box.name;
-          Mp4Parser.visualSampleEntry(box);
-        })
-        .box('dvav', (box) => {
-          baseBox = box.name;
-          Mp4Parser.visualSampleEntry(box);
-        })
-        .box('dvh1', (box) => {
-          baseBox = box.name;
-          Mp4Parser.visualSampleEntry(box);
-        })
-        .box('dvhe', (box) => {
-          baseBox = box.name;
-          Mp4Parser.visualSampleEntry(box);
-        })
-        .box('vp09', (box) => {
-          baseBox = box.name;
-          Mp4Parser.visualSampleEntry(box);
-        })
-        .box('av01', (box) => {
-          baseBox = box.name;
-          Mp4Parser.visualSampleEntry(box);
-        })
+        .box('avc1', genericVideoBox)
+        .box('avc3', genericVideoBox)
+        .box('hev1', genericVideoBox)
+        .box('hvc1', genericVideoBox)
+        .box('dva1', genericVideoBox)
+        .box('dvav', genericVideoBox)
+        .box('dvh1', genericVideoBox)
+        .box('dvhe', genericVideoBox)
+        .box('vp09', genericVideoBox)
+        .box('av01', genericVideoBox)
         .box('avcC', (box) => {
           let codecBase = baseBox || '';
           switch (baseBox) {

package/lib/media/streaming_engine.js

@@ -134,6 +134,12 @@ shaka.media.StreamingEngine = class {
       projection: null,
       hfov: null,
     };
+
+    /** @private {number} */
+    this.playRangeStart_ = 0;
+
+    /** @private {number} */
+    this.playRangeEnd_ = Infinity;
   }
 
   /** @override */
@@ -251,6 +257,20 @@ shaka.media.StreamingEngine = class {
   }
 
 
+  /**
+   * Applies a playback range. This will only affect non-live content.
+   *
+   * @param {number} playRangeStart
+   * @param {number} playRangeEnd
+   */
+  applyPlayRange(playRangeStart, playRangeEnd) {
+    if (!this.manifest_.presentationTimeline.isLive()) {
+      this.playRangeStart_ = playRangeStart;
+      this.playRangeEnd_ = playRangeEnd;
+    }
+  }
+
+
   /**
    * Initialize and start streaming.
    *
@@ -1899,10 +1919,11 @@ shaka.media.StreamingEngine = class {
     // Rounding issues can cause us to remove the first frame of a Period, so
     // reduce the window start time slightly.
     const appendWindowStart = Math.max(0,
-        reference.appendWindowStart -
+        Math.max(reference.appendWindowStart, this.playRangeStart_) -
         StreamingEngine.APPEND_WINDOW_START_FUDGE_);
     const appendWindowEnd =
-        reference.appendWindowEnd + StreamingEngine.APPEND_WINDOW_END_FUDGE_;
+        Math.min(reference.appendWindowEnd, this.playRangeEnd_) +
+        StreamingEngine.APPEND_WINDOW_END_FUDGE_;
 
     goog.asserts.assert(
         reference.startTime <= appendWindowEnd,

package/lib/player.js

@@ -2401,6 +2401,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         this.config_.playRangeStart,
         this.config_.playRangeEnd);
 
+    this.streamingEngine_.applyPlayRange(
+        this.config_.playRangeStart, this.config_.playRangeEnd);
 
     const setupPlayhead = (startTime) => {
       this.playhead_ = this.createPlayhead(startTime);
@@ -7457,7 +7459,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.9.6' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.9.8' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/util/mime_utils.js

@@ -174,7 +174,12 @@ shaka.util.MimeUtils = class {
         return 'hevc'; // H265
       case base === 'dvh1':
       case base === 'dvhe':
-        return 'dovi'; // Dolby Vision
+        return 'dovi-hevc'; // Dolby Vision based in HEVC
+      case base === 'dvav':
+      case base === 'dva1':
+        return 'dovi-avc'; // Dolby Vision based in AVC
+      case base === 'dav1':
+        return 'dovi-av1'; // Dolby Vision based in AV1
     }
     return base;
   }

package/lib/util/mp4_box_parsers.js

@@ -275,11 +275,11 @@ shaka.util.Mp4BoxParsers = class {
   }
 
   /**
-   * Parses a MP4A box.
+   * Parses an audio sample entry box.
    * @param {!shaka.util.DataViewReader} reader
-   * @return {!shaka.util.ParsedMP4ABox}
+   * @return {!shaka.util.ParsedAudioSampleEntryBox}
    */
-  static parseMP4A(reader) {
+  static audioSampleEntry(reader) {
     reader.skip(6); // Skip "reserved"
     reader.skip(2); // Skip "data_reference_index"
     reader.skip(8); // Skip "reserved"
@@ -820,7 +820,7 @@ shaka.util.ParsedTENCBox;
  *
  * @exportDoc
  */
-shaka.util.ParsedMP4ABox;
+shaka.util.ParsedAudioSampleEntryBox;
 
 /**
  * @typedef {{

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.9.6",
+  "version": "4.9.8",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [

package/ui/locales/es.json

@@ -2,6 +2,7 @@
   "AD_DURATION": "Duración del anuncio",
   "AD_PROGRESS": "Anuncio [AD_ON] de [NUM_ADS]",
   "AD_TIME": "Anuncio: [AD_TIME]",
+  "AIRPLAY": "AirPlay",
   "AUTO_QUALITY": "Automático",
   "BACK": "Atrás",
   "CAPTIONS": "Subtítulos",
@@ -26,6 +27,7 @@
   "PICTURE_IN_PICTURE": "Imagen en imagen",
   "PLAY": "Reproducir",
   "PLAYBACK_RATE": "Velocidad de reproducción",
+  "QUALITY": "Calidad",
   "RECENTER_VR": "Recentrar",
   "RESOLUTION": "Resolución",
   "REWIND": "Rebobinar",

package/ui/locales/fr.json

@@ -1,7 +1,9 @@
 {
   "AD_DURATION": "Durée de l'annonce",
-  "AD_PROGRESS": "Annonce [AD_ON] sur [NUM_ADS]",
-  "AD_TIME": "Annonce : [AD_TIME]",
+  "AD_PROGRESS": "Annonce [AD_ON] sur [NUM_ADS]",
+  "AD_STATISTICS": "Statistiques de la annonce",
+  "AD_TIME": "Annonce : [AD_TIME]",
+  "AIRPLAY": "AirPlay",
   "AUTO_QUALITY": "Automatique",
   "BACK": "Retour",
   "CAPTIONS": "Sous-titres",
@@ -10,7 +12,7 @@
   "ENTER_PICTURE_IN_PICTURE": "Utiliser le mode Picture-in-Picture",
   "EXIT_FULL_SCREEN": "Quitter le mode plein écran",
   "EXIT_LOOP_MODE": "Arrêter la lecture en boucle de la vidéo en cours",
-  "EXIT_PICTURE_IN_PICTURE": "Quitter le mode PIP (Picture-in-picture)",
+  "EXIT_PICTURE_IN_PICTURE": "Quitter le mode PIP (Picture-in-picture)",
   "FAST_FORWARD": "Avance rapide",
   "FULL_SCREEN": "Plein écran",
   "LANGUAGE": "Langue",
@@ -26,11 +28,18 @@
   "PICTURE_IN_PICTURE": "Picture-in-Picture",
   "PLAY": "Visionner",
   "PLAYBACK_RATE": "Vitesse de lecture",
+  "QUALITY": "Qualité",
+  "RECENTER_VR": "Recentrer",
+  "REPLAY": "Rejouer",
   "RESOLUTION": "Résolution",
   "REWIND": "Retour arrière",
   "SEEK": "Chercher",
   "SKIP_AD": "Passer l'annonce",
   "SKIP_TO_LIVE": "Accéder à la partie la plus récente du direct",
+  "STATISTICS": "Statistiques",
+  "SUBTITLE_FORCED": "Forcé",
+  "SURROUND": "Surround",
+  "TOGGLE_STEREOSCOPIC": "Stéréoscopique ON/OFF",
   "UNDETERMINED_LANGUAGE": "Langue indéterminée",
   "UNMUTE": "Réactiver le son",
   "UNRECOGNIZED_LANGUAGE": "Non reconnu",

package/ui/locales/pt-BR.json

@@ -1,7 +1,9 @@
 {
   "AD_DURATION": "Duração do anúncio",
   "AD_PROGRESS": "Anúncio [AD_ON] de [NUM_ADS]",
+  "AD_STATISTICS": "Estatísticas de anúncios",
   "AD_TIME": "Anúncio: [AD_TIME]",
+  "AIRPLAY": "AirPlay",
   "AUTO_QUALITY": "Automática",
   "BACK": "Voltar",
   "CAPTIONS": "Legendas",
@@ -26,11 +28,18 @@
   "PICTURE_IN_PICTURE": "Picture-in-picture",
   "PLAY": "Reproduzir",
   "PLAYBACK_RATE": "Velocidade da reprodução",
+  "QUALITY": "Qualidade",
+  "RECENTER_VR": "Recentralizar",
+  "REPLAY": "Replay",
   "RESOLUTION": "Resolução",
   "REWIND": "Retroceder",
   "SEEK": "Procurar",
   "SKIP_AD": "Pular anúncio",
   "SKIP_TO_LIVE": "Pular para transmissão ao vivo",
+  "STATISTICS": "Estatísticas",
+  "SUBTITLE_FORCED": "Forçado",
+  "SURROUND": "Surround",
+  "TOGGLE_STEREOSCOPIC": "Alternar estereoscópico",
   "UNDETERMINED_LANGUAGE": "Indeterminado",
   "UNMUTE": "Ativar som",
   "UNRECOGNIZED_LANGUAGE": "Não reconhecido",

package/ui/locales/pt-PT.json

@@ -1,7 +1,9 @@
 {
   "AD_DURATION": "Duração do anúncio",
   "AD_PROGRESS": "Anúncio [AD_ON] de [NUM_ADS]",
+  "AD_STATISTICS": "Estatísticas de anúncios",
   "AD_TIME": "Anúncio: [AD_TIME]",
+  "AIRPLAY": "AirPlay",
   "AUTO_QUALITY": "Automático",
   "BACK": "Anterior",
   "CAPTIONS": "Legendas",
@@ -26,11 +28,18 @@
   "PICTURE_IN_PICTURE": "Ecrã no ecrã",
   "PLAY": "Reproduzir",
   "PLAYBACK_RATE": "Velocidade de reprodução",
+  "QUALITY": "Qualidade",
+  "RECENTER_VR": "Recentrar",
+  "REPLAY": "Repetição",
   "RESOLUTION": "Resolução",
   "REWIND": "Rebobinar",
   "SEEK": "Procurar",
   "SKIP_AD": "Ignorar anúncio",
   "SKIP_TO_LIVE": "Avançar para o direto",
+  "STATISTICS": "Estatísticas",
+  "SUBTITLE_FORCED": "Forçado",
+  "SURROUND": "Envolvente",
+  "TOGGLE_STEREOSCOPIC": "Alternar estereoscópico",
   "UNDETERMINED_LANGUAGE": "Indeterminado",
   "UNMUTE": "Reativar o som",
   "UNRECOGNIZED_LANGUAGE": "Não reconhecido",