shaka-player 4.7.8 → 4.7.10

package/lib/dash/dash_parser.js

@@ -1685,7 +1685,7 @@ shaka.dash.DashParser = class {
     // An attribute which is present and set to 0 should still result in
     // periodic updates.  For more, see:
     // https://github.com/Dash-Industry-Forum/Guidelines-TimingModel/issues/48
-    if (this.updatePeriod_ <= 0) {
+    if (this.updatePeriod_ < 0) {
       return;
     }
 

package/lib/dash/segment_template.js

@@ -755,16 +755,10 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
 
     this.evict(this.periodStart_);
 
-    if (timeline.length === 0) {
-      return;
-    }
-
-    if (this.periodEnd_ !== Infinity) {
-      // Adjust the last timeline entry to match the period end
-      const lastTimePeriod = timeline[timeline.length - 1];
-      // NOTE: end should be relative to period start
-      lastTimePeriod.end = this.periodEnd_ - this.periodStart_;
-    }
+    // Do NOT adjust last range to match period end! With high precision
+    // timestamps several recalculations may give wrong results on less precise
+    // platforms. To mitigate that, we're using cached |periodEnd_| value in
+    // find/get() methods whenever possible.
   }
 
   /**
@@ -784,7 +778,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     const timeline = this.templateInfo_.timeline;
 
     // Early exit if the time isn't within this period
-    if (time < this.periodStart_ || time > this.periodEnd_) {
+    if (time < this.periodStart_ || time >= this.periodEnd_) {
       return null;
     }
 
@@ -797,10 +791,14 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
       // the references by a fraction of a second. To account for this, we use
       // the start of the next segment as /end/, unless this is the last
       // reference, in which case we use the period end as the /end/
-      let end = range.end + this.periodStart_;
+      let end;
 
       if (i < lastIndex) {
         end = timeline[i + 1].start + this.periodStart_;
+      } else if (this.periodEnd_ === Infinity) {
+        end = range.end + this.periodStart_;
+      } else {
+        end = this.periodEnd_;
       }
 
       if ((time >= start) && (time < end)) {
@@ -831,6 +829,12 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
           .unscaledPresentationTimeOffset + range.unscaledStart;
       const timestampOffset = this.periodStart_ -
         this.templateInfo_.scaledPresentationTimeOffset;
+      const trueSegmentEnd = this.periodStart_ + range.end;
+      let segmentEnd = trueSegmentEnd;
+      if (correctedPosition === this.getNumReferences() - 1 &&
+          this.periodEnd_ !== Infinity) {
+        segmentEnd = this.periodEnd_;
+      }
 
       const partialSegmentRefs = [];
 
@@ -901,7 +905,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
 
       ref = new shaka.media.SegmentReference(
           this.periodStart_ + range.start,
-          this.periodStart_ + range.end,
+          segmentEnd,
           createUrisCb,
           /* startByte= */ 0,
           /* endByte= */ null,
@@ -916,6 +920,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
           shaka.media.SegmentReference.Status.AVAILABLE,
           this.aes128Key_,
           /* allPartialSegments= */ range.partialSegments > 0);
+      ref.trueEndTime = trueSegmentEnd;
       this.references[correctedPosition] = ref;
     }
 

package/lib/hls/hls_parser.js

@@ -2839,12 +2839,12 @@ shaka.hls.HlsParser = class {
     // Don't download the key object until the segment is parsed, to avoid a
     // startup delay for long manifests with lots of keys.
     keyInfo.fetchKey = async () => {
-      const keyUri = shaka.hls.Utils.constructSegmentUris(
+      const keyUris = shaka.hls.Utils.constructSegmentUris(
           getUris(), drmTag.getRequiredAttrValue('URI'), variables);
 
       const requestType = shaka.net.NetworkingEngine.RequestType.KEY;
       const request = shaka.net.NetworkingEngine.makeRequest(
-          [keyUri], this.config_.retryParameters);
+          keyUris, this.config_.retryParameters);
       const keyResponse = await this.makeNetworkRequest_(request, requestType);
 
       // keyResponse.status is undefined when URI is "data:text/plain;base64,"

package/lib/media/content_workarounds.js

@@ -69,6 +69,30 @@ shaka.media.ContentWorkarounds = class {
         })
         .fullBox('encv', onEncryptionMetadataBox)
         .fullBox('enca', onEncryptionMetadataBox)
+        .fullBox('dvav', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
+        .fullBox('dva1', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
+        .fullBox('dvh1', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
+        .fullBox('dvhe', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
         .fullBox('hev1', (box) => {
           boxesToModify.push({
             box,

package/lib/media/segment_reference.js

@@ -129,7 +129,10 @@ shaka.media.InitSegmentReference = class {
   static equal(reference1, reference2) {
     const ArrayUtils = shaka.util.ArrayUtils;
     const BufferUtils = shaka.util.BufferUtils;
-    if (!reference1 || !reference2) {
+
+    if (reference1 === reference2) {
+      return true;
+    } else if (!reference1 || !reference2) {
       return reference1 == reference2;
     } else {
       return reference1.getStartByte() == reference2.getStartByte() &&

package/lib/media/streaming_engine.js

@@ -2163,8 +2163,8 @@ shaka.media.StreamingEngine = class {
     const bufferedBehind = presentationTime - startTime;
 
     const overflow = bufferedBehind - bufferBehind;
-    // See: https://github.com/shaka-project/shaka-player/issues/2982
-    if (overflow <= 0.01) {
+    // See: https://github.com/shaka-project/shaka-player/issues/6240
+    if (overflow <= 1) {
       shaka.log.v2(logPrefix,
           'buffer behind okay:',
           'presentationTime=' + presentationTime,

package/lib/player.js

@@ -1795,8 +1795,17 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     this.drmEngine_.configure(this.config_.drm);
 
+    const tracksChanged = shaka.util.StreamUtils.applyRestrictions(
+        this.manifest_.variants, this.config_.restrictions, this.maxHwRes_);
+    if (tracksChanged && this.streamingEngine_) {
+      this.onTracksChanged_();
+    }
+
+    const playableVariants = shaka.util.StreamUtils.getPlayableVariants(
+        this.manifest_.variants);
+
     await this.drmEngine_.initForPlayback(
-        this.manifest_.variants,
+        playableVariants,
         this.manifest_.offlineSessionIds);
 
     await this.drmEngine_.attach(this.video_);
@@ -6925,7 +6934,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.7.8' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.7.10' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/util/cmcd_manager.js

@@ -27,13 +27,6 @@ shaka.util.CmcdManager = class {
     /** @private {?shaka.extern.CmcdConfiguration} */
     this.config_ = config;
 
-    /**
-     * Session ID
-     *
-     * @private {string}
-     */
-    this.sid_ = '';
-
     /**
      * Streaming format
      *
@@ -65,9 +58,6 @@ shaka.util.CmcdManager = class {
    */
   configure(config) {
     this.config_ = config;
-    if (this.config_.sessionId && this.config_.sessionId != this.sid_) {
-      this.sid_ = '';
-    }
   }
 
   /**
@@ -295,13 +285,13 @@ shaka.util.CmcdManager = class {
    * @private
    */
   createData_() {
-    if (!this.sid_) {
-      this.sid_ = this.config_.sessionId || window.crypto.randomUUID();
+    if (!this.config_.sessionId) {
+      this.config_.sessionId = window.crypto.randomUUID();
     }
     return {
       v: shaka.util.CmcdManager.Version,
       sf: this.sf_,
-      sid: this.sid_,
+      sid: this.config_.sessionId,
       cid: this.config_.contentId,
       mtp: this.playerInterface_.getBandwidthEstimate() / 1000,
     };

package/lib/util/periods.js

@@ -1215,7 +1215,18 @@ shaka.util.PeriodCombiner = class {
       return false;
     }
 
-    // If language-based differences haven't decided this, look at roles.  If
+    // If language-based differences haven't decided this, look at labels.
+    // If available options differ, look does any matches with output stream.
+    if (best.label !== candidate.label) {
+      if (outputStream.label === best.label) {
+        return false;
+      }
+      if (outputStream.label === candidate.label) {
+        return true;
+      }
+    }
+
+    // If label-based differences haven't decided this, look at roles.  If
     // the candidate has more roles in common with the output, upgrade to the
     // candidate.
     if (outputStream.roles.length) {
@@ -1410,6 +1421,17 @@ shaka.util.PeriodCombiner = class {
       return false;
     }
 
+    // If language-based differences haven't decided this, look at labels.
+    // If available options differ, look does any matches with output stream.
+    if (best.label !== candidate.label) {
+      if (outputStream.label === best.label) {
+        return false;
+      }
+      if (outputStream.label === candidate.label) {
+        return true;
+      }
+    }
+
     // If the candidate has more roles in common with the output, upgrade to the
     // candidate.
     if (outputStream.roles.length) {

package/lib/util/stream_utils.js

@@ -908,7 +908,7 @@ shaka.util.StreamUtils = class {
     // currently don't support 'fLaC', while 'flac' is supported by most
     // major browsers.
     // See https://bugs.chromium.org/p/chromium/issues/detail?id=1422728
-    if (codecs === 'fLaC') {
+    if (codecs === 'fLaC' && !shaka.util.Platform.isSafari()) {
       return 'flac';
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.7.8",
+  "version": "4.7.10",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -43,7 +43,7 @@
     "karma-coverage": "^2.2.0",
     "karma-jasmine": "^4.0.1",
     "karma-jasmine-ajax": "^0.1.13",
-    "karma-local-wd-launcher": "^1.6.6",
+    "karma-local-wd-launcher": "^1.6.7",
     "karma-opera-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.8",
     "karma-spec-reporter": "^0.0.34",

package/ui/externs/ui.js

@@ -21,9 +21,7 @@ shaka.extern = {};
  *   base: string,
  *   buffered: string,
  *   played: string,
- *   adBreaks: string,
- *   chapterMarks: string,
- *   chapterLabels: string
+ *   adBreaks: string
  * }}
  *
  * @property {string} base
@@ -38,13 +36,6 @@ shaka.extern = {};
  * @property {string} adBreaks
  *   The CSS background color applied to the portion of the seek bar showing
  *   when the ad breaks are scheduled to occur on the timeline.
- * @property {string} chapterMarks
- *   The CSS border color applied to sections of the seek bar showing
- *   when the chapters start and end on the timeline.
- *   Defaults to dark grey rgb(27, 27, 27).
- * @property {string} chapterLabels
- *   The CSS text color applied to the chapter labels that appear above the
- *   seek bar on hover. Defaults to white rgb(255, 255, 255).
  * @exportDoc
  */
 shaka.extern.UISeekBarColors;

package/ui/less/range_elements.less

@@ -154,36 +154,3 @@
 .shaka-ad-markers {
   .overlay-child();
 }
-
-#shaka-player-ui-chapters-container {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: row;
-  z-index: 0;
-}
-
-.shaka-chapter {
-  height: 100%;
-  position: relative;
-}
-
-.shaka-chapter-label {
-  position: relative;
-  top: -2.5em;
-  width: 100%;
-  text-align: center;
-  text-shadow: 1px 1px gray;
-  line-height: normal;
-}
-
-.shaka-chapter > div:first-child {
-  width: 100%;
-  height: 100%;
-  border-right: 1px solid;
-  position: absolute;
-}
-
-.shaka-chapter:last-child > div:first-child {
-  border-right: none;
-}

package/ui/seek_bar.js

@@ -16,7 +16,6 @@ goog.require('shaka.ui.RangeElement');
 goog.require('shaka.ui.Utils');
 goog.require('shaka.util.Dom');
 goog.require('shaka.util.Error');
-goog.require('shaka.util.EventManager');
 goog.require('shaka.util.Mp4Parser');
 goog.require('shaka.util.Networking');
 goog.require('shaka.util.Timer');
@@ -84,18 +83,6 @@ shaka.ui.SeekBar = class extends shaka.ui.RangeElement {
       this.markAdBreaks_();
     });
 
-    /**
-     * @private {shaka.util.EventManager}
-     */
-    this.chaptersEventManager_ = new shaka.util.EventManager();
-
-
-    /** @private {!HTMLElement} */
-    this.chaptersContainer_ = shaka.util.Dom.createHTMLElement('div');
-    this.chaptersContainer_.id = 'shaka-player-ui-chapters-container';
-    this.container.appendChild(this.chaptersContainer_);
-
-    this.setupChapters_();
 
     /**
      * When user is scrubbing the seek bar - we should pause the video - see
@@ -238,8 +225,6 @@ shaka.ui.SeekBar = class extends shaka.ui.RangeElement {
       this.adBreaksTimer_ = null;
     }
 
-    this.chaptersEventManager_.release();
-
     super.release();
   }
 
@@ -693,203 +678,6 @@ shaka.ui.SeekBar = class extends shaka.ui.RangeElement {
       return minutes + ':' + seconds;
     }
   }
-
-  /**
-   * Sets up the chapter element creator and change handling.
-   * @private
-   */
-  setupChapters_() {
-    let language = 'und';
-    /** @type {!Array<shaka.extern.Chapter>} */
-    let chapters = [];
-
-    /**
-    * Does a value compare on chapters.
-    * @param {shaka.extern.Chapter} a
-    * @param {shaka.extern.Chapter} b
-    * @return {boolean}
-    */
-    const chaptersEqual = (a, b) => {
-      return (!a && !b) || (a.id === b.id && a.title === b.title &&
-          a.startTime === b.startTime && a.endTime === b.endTime);
-    };
-
-    /** @type {function(): void} */
-    const handleChapterTrackChange = () => {
-      let nextLanguage = 'und';
-      /** @type {!Array<shaka.extern.Chapter>} */
-      let nextChapters = [];
-
-      const currentLocales = this.localization.getCurrentLocales();
-      for (const locale of Array.from(currentLocales)) {
-        nextLanguage = locale;
-        nextChapters = this.player.getChapters(nextLanguage);
-        if (nextChapters.length) {
-          break;
-        }
-      }
-      if (!nextChapters.length) {
-        nextLanguage = 'und';
-        nextChapters = this.player.getChapters(nextLanguage);
-      }
-
-      const languageChanged = nextLanguage !== language;
-      const chaptersChanged = chapters.length !== nextChapters.length ||
-        !chapters.some((c, idx) => {
-          const n = nextChapters.at(idx);
-          return chaptersEqual(c, n) ||
-            nextChapters.some((n) => chaptersEqual(c, n));
-        });
-
-      language = nextLanguage;
-      chapters = nextChapters;
-      if (!nextChapters.length) {
-        this.deletePreviousChapters_();
-      } else if (languageChanged || chaptersChanged) {
-        this.createChapterElements_(this.container, chapters);
-      }
-    };
-
-    handleChapterTrackChange();
-
-    this.eventManager.listen(
-        this.player, 'unloading', () => {
-          this.deletePreviousChapters_();
-          language = 'und';
-          chapters = [];
-        });
-
-    this.eventManager.listen(
-        this.player, 'trackschanged', handleChapterTrackChange);
-
-    this.eventManager.listen(
-        this.localization, shaka.ui.Localization.LOCALE_UPDATED, () => {
-          handleChapterTrackChange();
-        });
-
-    this.eventManager.listen(
-        this.localization, shaka.ui.Localization.LOCALE_CHANGED, () => {
-          handleChapterTrackChange();
-        });
-  }
-
-  /**
-   * Builds and inserts ChaptersElement into dom container.
-   * @param {!HTMLElement} container
-   * @param {!Array<shaka.extern.Chapter>} chapterTracks
-   * @private
-   */
-  createChapterElements_(container, chapterTracks) {
-    this.deletePreviousChapters_();
-
-    const hiddenClass = 'shaka-hidden';
-
-    /** @type {{start: number, end: number}} */
-    const seekRange = this.player.seekRange();
-
-    /**
-     * @type {!Array<{
-     *  start: number,
-     *  end: number,
-     *  size: number,
-     *  title: string,
-     *  id: string
-     * }>}
-     * */
-    const chapters = [];
-
-    for (const c of chapterTracks) {
-      if (c.startTime >= seekRange.end) {
-        continue;
-      }
-      const start = c.startTime > seekRange.start ?
-        c.startTime : seekRange.start;
-      const end = c.endTime < seekRange.end ?
-        c.endTime : seekRange.end;
-      const size = (end-start);
-      chapters.push({start, end, size, title: c.title, id: c.id});
-    }
-
-    if (chapters.length < 2) {
-      return;
-    }
-
-    const totalSize = chapters.reduce((t, c) => {
-      t += c.size;
-      return t;
-    }, 0);
-
-    /**
-     * @type {!Array<{
-     *  start: number,
-     *  end: number,
-     *  el: HTMLElement
-     * }>}
-     * */
-    const chapterElMap = [];
-
-    for (const c of chapters) {
-      /** @type {!HTMLElement} */
-      const chapterEl = shaka.util.Dom.createHTMLElement('div');
-      chapterEl.classList.add('shaka-chapter');
-      chapterEl.style.width = `${c.size * 100 / totalSize}%`;
-
-      this.chaptersContainer_.appendChild(chapterEl);
-
-      /** @type {!HTMLElement} */
-      const chapterMarker = shaka.util.Dom.createHTMLElement('div');
-      chapterMarker.style.borderColor =
-        this.config_.seekBarColors.chapterMarks;
-      chapterEl.appendChild(chapterMarker);
-
-      /** @type {!HTMLElement} */
-      const chapterLabel = shaka.util.Dom.createHTMLElement('p');
-      chapterLabel.classList.add('shaka-chapter-label', hiddenClass);
-      chapterLabel.style.color =
-        this.config_.seekBarColors.chapterLabels;
-      chapterLabel.innerText = c.title;
-      chapterEl.appendChild(chapterLabel);
-
-      chapterElMap.push(
-          {start: c.start, end: c.end, el: chapterLabel});
-    }
-
-    // Add chapter event listeners
-    this.chaptersEventManager_.listen(this.bar, 'pointermove', (e) => {
-      if (!e.target) {
-        return;
-      }
-      const target = /** @type {HTMLElement} */(e.target);
-
-      const screenXDiff = e.offsetX / target.clientWidth;
-      const rangeMax = parseInt(target.getAttribute('max'), 10);
-      const hoverVal = screenXDiff * rangeMax;
-
-      for (const c of chapterElMap) {
-        const hidden = c.el.classList.contains(hiddenClass);
-        const inChapter = c.start <= hoverVal && hoverVal < c.end;
-        if (inChapter === hidden) {
-          c.el.classList.toggle(hiddenClass);
-        }
-      }
-    }, {passive: true});
-
-    this.chaptersEventManager_.listen(this.bar, 'pointerout', () => {
-      for (const c of chapterElMap) {
-        if (!c.el.classList.contains(hiddenClass)) {
-          c.el.classList.add(hiddenClass);
-        }
-      }
-    }, {passive: true});
-  }
-
-  /**
-   * @private
-   */
-  deletePreviousChapters_() {
-    this.chaptersEventManager_.removeAll();
-    shaka.util.Dom.removeAllChildren(this.chaptersContainer_);
-  }
 };
 
 

package/ui/ui.js

@@ -229,8 +229,6 @@ shaka.ui.Overlay = class {
         buffered: 'rgba(255, 255, 255, 0.54)',
         played: 'rgb(255, 255, 255)',
         adBreaks: 'rgb(255, 204, 0)',
-        chapterMarks: 'rgb(27, 27, 27)',
-        chapterLabels: 'rgb(255, 255, 255)',
       },
       volumeBarColors: {
         base: 'rgba(255, 255, 255, 0.54)',