shaka-player 4.6.12 → 4.6.13

package/docs/tutorials/ui-customization.md

@@ -188,19 +188,6 @@ const config = {
 ui.configure(config);
 ```
 
-If you've chosen to display chapters, you can specify the color for the chapter markers on
-the timeline and the text color of the chapter titles that popup on hover:
- ```js
-const config = {
-  displayChapters: true,
-  seekBarColors: {
-    chapterMarks: 'rgb(27, 27, 27)',
-    chapterLabels: 'rgb(255, 255, 255)'
-  }
-}
-ui.configure(config);
-```
-
 #### Configuring playback, fast forward and rewind rates
 The rate in which the player can play, fast forward and rewind content can be configured using the `playbackRates`, `fastForwardRates` and `rewindRates` options.
 

package/lib/dash/dash_parser.js

@@ -1640,7 +1640,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/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/player.js

@@ -1779,8 +1779,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_);
@@ -6828,7 +6837,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.6.12' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.6.13' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/package.json

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

package/test/dash/dash_parser_live_unit.js

@@ -642,6 +642,25 @@ describe('DashParser Live', () => {
     expect(updateTick).toHaveBeenCalledTimes(1);
   });
 
+  it('still updates when @minimumUpdatePeriod is zero', async () => {
+    const lines = [
+      '<SegmentTemplate startNumber="1" media="s$Number$.mp4" duration="2" />',
+    ];
+    // updateTime parameter sets @minimumUpdatePeriod in the manifest.
+    const manifestText = makeSimpleLiveManifestText(lines, /* updateTime= */ 0);
+
+    /** @type {!jasmine.Spy} */
+    const tickAfter = updateTickSpy();
+    Date.now = () => 0;
+
+    fakeNetEngine.setResponseText('dummy://foo', manifestText);
+    await parser.start('dummy://foo', playerInterface);
+
+    expect(tickAfter).toHaveBeenCalledTimes(1);
+    const delay = tickAfter.calls.mostRecent().args[0];
+    expect(delay).toBe(0);
+  });
+
   it('uses @minimumUpdatePeriod', async () => {
     const lines = [
       '<SegmentTemplate startNumber="1" media="s$Number$.mp4" duration="2" />',

package/test/player_integration.js

@@ -61,6 +61,46 @@ describe('Player', () => {
     document.body.removeChild(video);
   });
 
+  describe('seek range', () => {
+    // Regression test for Issue #3675.
+    it('has a reasonable seek range after going from live to VOD', async () => {
+      const netEngine = player.getNetworkingEngine();
+      const startTime = Date.now();
+      netEngine.registerRequestFilter((type, request) => {
+        if (type != shaka.net.NetworkingEngine.RequestType.MANIFEST) {
+          return;
+        }
+        // Simulate a live stream by providing different manifests over time.
+        const time = (Date.now() - startTime) / 1000;
+        const manifestNumber = Math.min(5, Math.floor(0.5 + time / 2));
+        request.uris = [
+          '/base/test/test/assets/3675/dash_' + manifestNumber + '.mpd',
+        ];
+        console.log('getting manifest', request.uris);
+      });
+
+      // Play the stream.
+      await player.load('/base/test/test/assets/3675/dash_0.mpd');
+      await video.play();
+
+      // Wait for the stream to be over.
+      eventManager.listen(player, 'error', Util.spyFunc(onErrorSpy));
+      /** @type {shaka.test.Waiter} */
+      const waiter = new shaka.test.Waiter(eventManager)
+          .setPlayer(player)
+          .timeoutAfter(40)
+          .failOnTimeout(true);
+      await waiter.waitForEnd(video);
+
+      // The stream should have transitioned to VOD by now.
+      expect(player.isLive()).toBe(false);
+
+      // Check that the final seek range is as expected.
+      const seekRange = player.seekRange();
+      expect(seekRange.end).toBeCloseTo(14);
+    });
+  });
+
   describe('attach', () => {
     beforeEach(async () => {
       // To test attach, we want to construct a player without a video element
@@ -908,46 +948,6 @@ describe('Player', () => {
     });
   });
 
-  describe('seek range', () => {
-    // Regression test for Issue #3675.
-    it('has a reasonable seek range after going from live to VOD', async () => {
-      const netEngine = player.getNetworkingEngine();
-      const startTime = Date.now();
-      netEngine.registerRequestFilter((type, request) => {
-        if (type != shaka.net.NetworkingEngine.RequestType.MANIFEST) {
-          return;
-        }
-        // Simulate a live stream by providing different manifests over time.
-        const time = (Date.now() - startTime) / 1000;
-        const manifestNumber = Math.min(5, Math.floor(0.5 + time / 2));
-        request.uris = [
-          '/base/test/test/assets/3675/dash_' + manifestNumber + '.mpd',
-        ];
-        console.log('getting manifest', request.uris);
-      });
-
-      // Play the stream.
-      await player.load('/base/test/test/assets/3675/dash_0.mpd');
-      await video.play();
-
-      // Wait for the stream to be over.
-      eventManager.listen(player, 'error', Util.spyFunc(onErrorSpy));
-      /** @type {shaka.test.Waiter} */
-      const waiter = new shaka.test.Waiter(eventManager)
-          .setPlayer(player)
-          .timeoutAfter(40)
-          .failOnTimeout(true);
-      await waiter.waitForEnd(video);
-
-      // The stream should have transitioned to VOD by now.
-      expect(player.isLive()).toBe(false);
-
-      // Check that the final seek range is as expected.
-      const seekRange = player.seekRange();
-      expect(seekRange.end).toBeCloseTo(14);
-    });
-  });
-
   describe('buffering', () => {
     const startBuffering = jasmine.objectContaining({buffering: true});
     const endBuffering = jasmine.objectContaining({buffering: false});
@@ -1012,6 +1012,9 @@ describe('Player', () => {
     });
 
     it('buffers ahead of the playhead', async () => {
+      if (window.ManagedMediaSource) {
+        pending('ManagedMediaSource has buffer control signals.');
+      }
       player.configure('streaming.bufferingGoal', 10);
 
       await player.load('test:sintel_long_compiled');
@@ -1036,6 +1039,9 @@ describe('Player', () => {
     });
 
     it('clears buffer behind playhead', async () => {
+      if (window.ManagedMediaSource) {
+        pending('ManagedMediaSource has buffer control signals.');
+      }
       player.configure('streaming.bufferingGoal', 30);
       player.configure('streaming.bufferBehind', 30);
 

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)',