shaka-player 3.3.2 → 4.0.0

package/test/util/buffer_utils_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.BufferUtils');
-
 describe('BufferUtils', () => {
   const BufferUtils = shaka.util.BufferUtils;
 

package/test/util/cmcd_manager_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.CmcdManager');
-goog.require('shaka.util.ObjectUtils');
-
 describe('CmcdManager', () => {
   const CmcdManager = shaka.util.CmcdManager;
   const uuidRegex =
@@ -123,6 +120,9 @@ describe('CmcdManager', () => {
       retryParameters: /** @type {shaka.extern.RetryParameters} */({}),
       licenseRequestType: null,
       sessionId: null,
+      drmInfo: null,
+      initData: null,
+      initDataType: null,
       streamDataCallback: null,
     };
 

package/test/util/data_view_reader_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.DataViewReader');
-goog.require('shaka.util.Error');
-
 describe('DataViewReader', () => {
   const Util = shaka.test.Util;
 

package/test/util/ebml_parser_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.EbmlParser');
-goog.require('shaka.util.Error');
-
 describe('EbmlParser', /** @suppress {accessControls} */ () => {
   const Util = shaka.test.Util;
 

package/test/util/event_manager_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.EventManager');
-
 describe('EventManager', () => {
   const Util = shaka.test.Util;
 

package/test/util/fake_event_target_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.log');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.FakeEvent');
-goog.require('shaka.util.FakeEventTarget');
-
 describe('FakeEventTarget', () => {
   const Util = shaka.test.Util;
   const originalLogError = shaka.log.error;

package/test/util/iterables_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.Iterables');
-
 describe('Iterables', () => {
   const Iterables = shaka.util.Iterables;
 
@@ -67,66 +65,4 @@ describe('Iterables', () => {
       expect(Iterables.filter(input, (x) => x < 0)).toEqual([]);
     });
   });
-
-  describe('enumerate', () => {
-    function enumerate(it) {
-      return Array.from(Iterables.enumerate(it));
-    }
-
-    it('works with no items', () => {
-      expect(enumerate([])).toEqual([]);
-    });
-
-    it('works with one item', () => {
-      expect(enumerate([999]))
-          .toEqual([{i: 0, item: 999, prev: undefined, next: undefined}]);
-    });
-
-    it('works with special values', () => {
-      expect(enumerate([[]]))
-          .toEqual([{i: 0, item: [], prev: undefined, next: undefined}]);
-      expect(enumerate([0]))
-          .toEqual([{i: 0, item: 0, prev: undefined, next: undefined}]);
-      expect(enumerate([null]))
-          .toEqual([{i: 0, item: null, prev: undefined, next: undefined}]);
-      expect(enumerate([undefined]))
-          .toEqual([{i: 0, item: undefined, prev: undefined, next: undefined}]);
-    });
-
-    it('works with two items', () => {
-      expect(enumerate([888, 999]))
-          .toEqual([
-            {i: 0, item: 888, prev: undefined, next: 999},
-            {i: 1, item: 999, prev: 888, next: undefined},
-          ]);
-    });
-
-    it('works with three items', () => {
-      expect(enumerate([777, 888, 999]))
-          .toEqual([
-            {i: 0, item: 777, prev: undefined, next: 888},
-            {i: 1, item: 888, prev: 777, next: 999},
-            {i: 2, item: 999, prev: 888, next: undefined},
-          ]);
-    });
-
-    it('keeps references', () => {
-      const expected = [
-        {a: 'x'},
-        {b: 'y'},
-        {c: 'z'},
-      ];
-      const actual = enumerate(expected);
-
-      expect(actual[0].item).toBe(expected[0]);
-      expect(actual[0].next).toBe(expected[1]);
-
-      expect(actual[1].prev).toBe(expected[0]);
-      expect(actual[1].item).toBe(expected[1]);
-      expect(actual[1].next).toBe(expected[2]);
-
-      expect(actual[2].prev).toBe(expected[1]);
-      expect(actual[2].item).toBe(expected[2]);
-    });
-  });
 });

package/test/util/language_utils_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.LanguageUtils');
-goog.require('shaka.util.ManifestParserUtils');
-
 describe('LanguageUtils', () => {
   const LanguageUtils = shaka.util.LanguageUtils;
 

package/test/util/manifest_parser_utils_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.ManifestParserUtils');
-
 describe('ManifestParserUtils', () => {
   const ManifestParserUtils = shaka.util.ManifestParserUtils;
 

package/test/util/mp4_box_parsers_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('goog.asserts');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Mp4BoxParsers');
-goog.require('shaka.util.Mp4Parser');
-
 describe('Mp4BoxParsers', () => {
   const videoInitSegmentUri = '/base/test/test/assets/sintel-video-init.mp4';
   const videoSegmentUri = '/base/test/test/assets/sintel-video-segment.mp4';

package/test/util/mp4_parser_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.Mp4Parser');
-
 describe('Mp4Parser', () => {
   const Util = shaka.test.Util;
 

package/test/util/multi_map_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.MultiMap');
-
 describe('MultiMap', () => {
   /** @type {shaka.util.MultiMap<number>} */
   let map;

package/test/util/object_utils_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.ObjectUtils');
-
 describe('ObjectUtils', () => {
   const ObjectUtils = shaka.util.ObjectUtils;
 

package/test/util/periods_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.ManifestGenerator');
-goog.require('shaka.util.ManifestParserUtils');
-goog.require('shaka.util.PeriodCombiner');
-
 describe('PeriodCombiner', () => {
   // These test cases don't really read well as "it" statements.  Phrasing them
   // that way would make the names very long, so here we break with that
@@ -477,7 +473,7 @@ describe('PeriodCombiner', () => {
     a3.originalId = 'a3';
     a3.bandwidth = 97065;
     a3.roles = ['role1', 'role2'];
-    a2.codecs = 'mp4a.40.2';
+    a3.codecs = 'mp4a.40.2';
 
     // a4 has a different label from a3, and should not
     // be filtered out.
@@ -500,14 +496,24 @@ describe('PeriodCombiner', () => {
     const t1 = makeTextStream('en');
     t1.originalId = 't1';
     t1.roles = ['role1'];
+    t1.bandwidth = 1158;
 
     const t2 = makeTextStream('en');
     t2.originalId = 't2';
     t2.roles = ['role1', 'role2'];
+    t2.bandwidth = 1172;
 
     const t3 = makeTextStream('en');
     t3.originalId = 't3';
     t3.roles = ['role1'];
+    t3.bandwidth = 1158;
+
+    // t4 has a different bandwidth from t3, and should not
+    // be filtered out.
+    const t4 = makeTextStream('en');
+    t4.originalId = 't4';
+    t4.roles = ['role1'];
+    t4.bandwidth = 1186;
 
     // i1 and i3 are duplicates.
     const i1 = makeImageStream(240);
@@ -539,6 +545,7 @@ describe('PeriodCombiner', () => {
           t1,
           t2,
           t3,
+          t4,
         ],
         imageStreams: [
           i1,
@@ -565,7 +572,7 @@ describe('PeriodCombiner', () => {
     }
 
     const textStreams = combiner.getTextStreams();
-    expect(textStreams.length).toBe(2);
+    expect(textStreams.length).toBe(3);
 
     // t3 should've been filtered out
     const textIds = textStreams.map((t) => t.originalId);
@@ -1059,7 +1066,7 @@ describe('PeriodCombiner', () => {
   it('The number of variants stays stable after many periods ' +
       'when going between similar content and varying ads', async () => {
     // This test is based on the content from
-    // https://github.com/google/shaka-player/issues/2716
+    // https://github.com/shaka-project/shaka-player/issues/2716
     // that used to cause our period flattening logic to keep
     // creating new variants for every new period added.
     // It's ok to create a few additional varinats/streams,

package/test/util/pssh_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.Pssh');
-goog.require('shaka.util.Uint8ArrayUtils');
-
 describe('Pssh', () => {
   const Uint8ArrayUtils = shaka.util.Uint8ArrayUtils;
 

package/test/util/state_history_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.StateHistory');
-
 describe('StateHistory', () => {
   const oldDateNow = Date.now;
 

package/test/util/stream_utils_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.FakeDrmEngine');
-goog.require('shaka.test.ManifestGenerator');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.StreamUtils');
-
 describe('StreamUtils', () => {
   const StreamUtils = shaka.util.StreamUtils;
 
@@ -184,7 +179,7 @@ describe('StreamUtils', () => {
     });
 
     it('chooses only one role, even if none is preferred', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/949
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/949
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addTextStream(0, (stream) => {
           stream.language = 'en';
@@ -223,7 +218,7 @@ describe('StreamUtils', () => {
     });
 
     it('chooses only one role, even if all are primary', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/949
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/949
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addTextStream(0, (stream) => {
           stream.language = 'en';
@@ -269,7 +264,7 @@ describe('StreamUtils', () => {
     });
 
     it('chooses only one language, even if all are primary', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/918
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/918
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addTextStream(0, (stream) => {
           stream.language = 'en';
@@ -624,11 +619,20 @@ describe('StreamUtils', () => {
           stream.mimeType = 'image/png';
         });
         manifest.addImageStream(3, (stream) => {
-          stream.mimeType = 'image/jpeg';
+          stream.mimeType = 'image/jpg';
         });
         manifest.addImageStream(4, (stream) => {
+          stream.mimeType = 'image/jpeg';
+        });
+        manifest.addImageStream(5, (stream) => {
           stream.mimeType = 'image/bogus';
         });
+        manifest.addImageStream(6, (stream) => {
+          stream.mimeType = 'image/avif';
+        });
+        manifest.addImageStream(7, (stream) => {
+          stream.mimeType = 'image/webp';
+        });
       });
 
       const noVariant = null;
@@ -636,12 +640,19 @@ describe('StreamUtils', () => {
           fakeDrmEngine, noVariant, manifest);
 
       // Covers a regression in which we would remove streams with codecs.
-      // The last two streams should be removed because their full MIME types
-      // are bogus.
-      expect(manifest.imageStreams.length).toBe(3);
-      expect(manifest.imageStreams[0].id).toBe(1);
-      expect(manifest.imageStreams[1].id).toBe(2);
-      expect(manifest.imageStreams[2].id).toBe(3);
+      // The first 4 streams should be there because they are always supported.
+      // The 5th stream should be removed because the MIME type is bogus.
+      // The 6th and 7th streams may be there, based on platform support.
+      expect(manifest.imageStreams).toContain(
+          jasmine.objectContaining({id: 1}));
+      expect(manifest.imageStreams).toContain(
+          jasmine.objectContaining({id: 2}));
+      expect(manifest.imageStreams).toContain(
+          jasmine.objectContaining({id: 3}));
+      expect(manifest.imageStreams).toContain(
+          jasmine.objectContaining({id: 4}));
+      expect(manifest.imageStreams).not.toContain(
+          jasmine.objectContaining({id: 5}));
     });
 
     it('filters transport streams', async () => {

package/test/util/string_utils_unit.js

@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.ManifestParserUtils');
-goog.require('shaka.util.StringUtils');
-
 describe('StringUtils', () => {
   const StringUtils = shaka.util.StringUtils;
 

package/test/util/text_parser_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.TextParser');
-
 describe('TextParser', () => {
   const TextParser = shaka.util.TextParser;
 

package/test/util/xml_utils_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('goog.asserts');
-goog.require('shaka.util.XmlUtils');
-
-
 describe('XmlUtils', () => {
   // A number that cannot be represented as a Javascript number.
   const HUGE_NUMBER_STRING = new Array(500).join('7');

package/ui/controls.js

@@ -9,7 +9,6 @@ goog.provide('shaka.ui.Controls');
 goog.provide('shaka.ui.ControlsPanel');
 
 goog.require('goog.asserts');
-goog.require('shaka.Deprecate');
 goog.require('shaka.ads.AdManager');
 goog.require('shaka.cast.CastProxy');
 goog.require('shaka.log');
@@ -556,33 +555,74 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
     this.hideSettingsMenusTimer_.tickNow();
   }
 
+  /**
+   * @return {boolean}
+   * @export
+   */
+  isFullScreenSupported() {
+    if (document.fullscreenEnabled) {
+      return true;
+    }
+    const video = /** @type {HTMLVideoElement} */(this.localVideo_);
+    if (video.webkitSupportsFullscreen) {
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * @return {boolean}
+   * @export
+   */
+  isFullScreenEnabled() {
+    if (document.fullscreenEnabled) {
+      return !!document.fullscreenElement;
+    }
+    const video = /** @type {HTMLVideoElement} */(this.localVideo_);
+    if (video.webkitSupportsFullscreen) {
+      return video.webkitDisplayingFullscreen;
+    }
+    return false;
+  }
+
   /** @export */
   async toggleFullScreen() {
-    if (document.fullscreenElement) {
-      if (screen.orientation) {
-        screen.orientation.unlock();
-      }
-      await document.exitFullscreen();
-    } else {
-      // If we are in PiP mode, leave PiP mode first.
-      try {
-        if (document.pictureInPictureElement) {
-          await document.exitPictureInPicture();
+    if (document.fullscreenEnabled) {
+      if (document.fullscreenElement) {
+        if (screen.orientation) {
+          screen.orientation.unlock();
         }
-        await this.videoContainer_.requestFullscreen({navigationUI: 'hide'});
-        if (this.config_.forceLandscapeOnFullscreen && screen.orientation) {
-          try {
-            // Locking to 'landscape' should let it be either
-            // 'landscape-primary' or 'landscape-secondary' as appropriate.
-            await screen.orientation.lock('landscape');
-          } catch (error) {
-            // If screen.orientation.lock does not work on a device, it will
-            // be rejected with an error. Suppress that error.
+        await document.exitFullscreen();
+      } else {
+        // If we are in PiP mode, leave PiP mode first.
+        try {
+          if (document.pictureInPictureElement) {
+            await document.exitPictureInPicture();
+          }
+          await this.videoContainer_.requestFullscreen({navigationUI: 'hide'});
+          if (this.config_.forceLandscapeOnFullscreen && screen.orientation) {
+            try {
+              // Locking to 'landscape' should let it be either
+              // 'landscape-primary' or 'landscape-secondary' as appropriate.
+              await screen.orientation.lock('landscape');
+            } catch (error) {
+              // If screen.orientation.lock does not work on a device, it will
+              // be rejected with an error. Suppress that error.
+            }
           }
+        } catch (error) {
+          this.dispatchEvent(new shaka.util.FakeEvent(
+              'error', (new Map()).set('detail', error)));
+        }
+      }
+    } else {
+      const video = /** @type {HTMLVideoElement} */(this.localVideo_);
+      if (video.webkitSupportsFullscreen) {
+        if (video.webkitDisplayingFullscreen) {
+          video.webkitExitFullscreen();
+        } else {
+          video.webkitEnterFullscreen();
         }
-      } catch (error) {
-        this.dispatchEvent(new shaka.util.FakeEvent(
-            'error', (new Map()).set('detail', error)));
       }
     }
   }
@@ -702,7 +742,8 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
     });
 
     this.eventManager_.listen(this.controlsContainer_, 'dblclick', () => {
-      if (this.config_.doubleClickForFullscreen && document.fullscreenEnabled) {
+      if (this.config_.doubleClickForFullscreen &&
+          this.isFullScreenSupported()) {
         this.toggleFullScreen();
       }
     });
@@ -826,22 +867,6 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
         const factory =
             shaka.ui.ControlsPanel.elementNamesToFactories_.get(name);
         const element = factory.create(this.controlsButtonPanel_, this);
-
-        if (typeof element.release != 'function') {
-          shaka.Deprecate.deprecateFeature(4,
-              'shaka.extern.IUIElement',
-              'Please update UI elements to have a release() method.');
-
-          // This cast works around compiler strictness about the IUIElement
-          // type being "@struct" (as ES6 classes are by default).
-          const moddableElement = /** @type {Object} */(element);
-          moddableElement['release'] = () => {
-            if (moddableElement['destroy']) {
-              moddableElement['destroy']();
-            }
-          };
-        }
-
         this.elements_.push(element);
       } else {
         shaka.log.alwaysWarn('Unrecognized control panel element requested:',

package/ui/fullscreen_button.js

@@ -28,16 +28,16 @@ shaka.ui.FullscreenButton = class extends shaka.ui.Element {
   constructor(parent, controls) {
     super(parent, controls);
 
+    /** @private {HTMLMediaElement} */
+    this.localVideo_ = this.controls.getLocalVideo();
+
     /** @private {!HTMLButtonElement} */
     this.button_ = shaka.util.Dom.createButton();
     this.button_.classList.add('shaka-fullscreen-button');
     this.button_.classList.add('material-icons-round');
     this.button_.classList.add('shaka-tooltip');
 
-    // Don't show the button if fullscreen is not supported
-    if (!document.fullscreenEnabled) {
-      this.button_.classList.add('shaka-hidden');
-    }
+    this.checkSupport_();
 
     this.button_.textContent = shaka.ui.Enums.MaterialDesignIcons.FULLSCREEN;
     this.parent.appendChild(this.button_);
@@ -61,6 +61,26 @@ shaka.ui.FullscreenButton = class extends shaka.ui.Element {
       this.updateIcon_();
       this.updateAriaLabel_();
     });
+
+    this.eventManager.listen(this.localVideo_, 'loadedmetadata', () => {
+      this.checkSupport_();
+    });
+
+    this.eventManager.listen(this.localVideo_, 'loadeddata', () => {
+      this.checkSupport_();
+    });
+  }
+
+  /**
+   * @private
+   */
+  checkSupport_() {
+    // Don't show the button if fullscreen is not supported
+    if (!this.controls.isFullScreenSupported()) {
+      this.button_.classList.add('shaka-hidden');
+    } else {
+      this.button_.classList.remove('shaka-hidden');
+    }
   }
 
   /**
@@ -68,7 +88,7 @@ shaka.ui.FullscreenButton = class extends shaka.ui.Element {
    */
   updateAriaLabel_() {
     const LocIds = shaka.ui.Locales.Ids;
-    const label = document.fullscreenElement ?
+    const label = this.controls.isFullScreenEnabled() ?
         LocIds.EXIT_FULL_SCREEN : LocIds.FULL_SCREEN;
 
     this.button_.ariaLabel = this.localization.resolve(label);
@@ -79,7 +99,7 @@ shaka.ui.FullscreenButton = class extends shaka.ui.Element {
    */
   updateIcon_() {
     this.button_.textContent =
-      document.fullscreenElement ?
+      this.controls.isFullScreenEnabled() ?
       shaka.ui.Enums.MaterialDesignIcons.EXIT_FULLSCREEN :
       shaka.ui.Enums.MaterialDesignIcons.FULLSCREEN;
   }

package/ui/less/ad_controls.less

@@ -78,11 +78,11 @@
 
   /* This math is determining how far the button is from the right edge.
    * Ad panel's parent is centered and @bottom-controls-width wide, so
-   * 100 - @bottom-controls-width = margins from both sides of the container.
+   * 100% - @bottom-controls-width = margins from both sides of the container.
    * That divided by 2 is margin on one side, so we take that, and move the
    * button from its normal position to the right by that percentage.
    */
-  right: (100 - @bottom-controls-width) / 2 * -1;
+  right: calc((100% - @bottom-controls-width) / 2 * -1);
   display: flex;
   flex-direction: row;
   margin: 0;
@@ -90,18 +90,18 @@
 
 .shaka-skip-ad-button {
   padding: 5px 15px;
-  background: rgba(0, 0, 0, 0.7);
+  background: rgba(0 0 0 / 70%);
   border: none;
 
   &:disabled {
-    background: rgba(0, 0, 0, 0.3);
+    background: rgba(0 0 0 / 30%);
   }
 
   cursor: pointer;
 }
 
 .shaka-skip-ad-counter {
-  padding: 5px 5px;
-  background: rgba(0, 0, 0, 0.7);
+  padding: 5px;
+  background: rgba(0 0 0 / 70%);
   margin: 0;
 }