shaka-player 3.3.5 → 4.0.2

package/lib/util/stream_utils.js

@@ -408,7 +408,7 @@ shaka.util.StreamUtils = class {
     shaka.util.StreamUtils.filterManifestByCurrentVariant(
         currentVariant, manifest);
     shaka.util.StreamUtils.filterTextStreams_(manifest);
-    shaka.util.StreamUtils.filterImageStreams_(manifest);
+    await shaka.util.StreamUtils.filterImageStreams_(manifest);
   }
 
 
@@ -815,37 +815,57 @@ shaka.util.StreamUtils = class {
    * @param {shaka.extern.Manifest} manifest
    * @private
    */
-  static filterImageStreams_(manifest) {
-    // Filter image streams.
-    manifest.imageStreams = manifest.imageStreams.filter((stream) => {
-      // TODO: re-examine this and avoid allow-listing the MIME types we can
-      // accept.
-      const validMimeTypes = [
-        'image/svg+xml',
-        'image/png',
-        'image/jpeg',
-      ];
-      const Platform = shaka.util.Platform;
-      // Add webp support to popular platforms that support it.
-      const webpSupport = Platform.isWebOS() ||
-                          Platform.isTizen() ||
-                          Platform.isChromecast();
-      if (webpSupport) {
-        validMimeTypes.push('image/webp');
+  static async filterImageStreams_(manifest) {
+    const imageStreams = [];
+    for (const stream of manifest.imageStreams) {
+      const mimeType = stream.mimeType;
+      if (!shaka.util.StreamUtils.supportedImageMimeTypes_.has(mimeType)) {
+        const minImage = shaka.util.StreamUtils.minImage_.get(mimeType);
+        if (minImage) {
+          // eslint-disable-next-line no-await-in-loop
+          const res = await shaka.util.StreamUtils.isImageSupported_(minImage);
+          shaka.util.StreamUtils.supportedImageMimeTypes_.set(mimeType, res);
+        } else {
+          shaka.util.StreamUtils.supportedImageMimeTypes_.set(mimeType, false);
+        }
       }
-      // TODO: add support to image/webp and image/avif
-      const keep = validMimeTypes.includes(stream.mimeType);
+
+      const keep =
+          shaka.util.StreamUtils.supportedImageMimeTypes_.get(mimeType);
 
       if (!keep) {
         shaka.log.debug('Dropping image stream. Is not supported by the ' +
                         'platform.', stream);
+      } else {
+        imageStreams.push(stream);
       }
+    }
+    manifest.imageStreams = imageStreams;
+  }
 
-      return keep;
+  /**
+   * @param {string} minImage
+   * @return {!Promise.<boolean>}
+   * @private
+   */
+  static isImageSupported_(minImage) {
+    return new Promise((resolve) => {
+      const imageElement = /** @type {HTMLImageElement} */(new Image());
+      imageElement.src = minImage;
+      if ('decode' in imageElement) {
+        imageElement.decode().then(() => {
+          resolve(true);
+        }).catch(() => {
+          resolve(false);
+        });
+      } else {
+        imageElement.onload = imageElement.onerror = () => {
+          resolve(imageElement.height === 2);
+        };
+      }
     });
   }
 
-
   /**
    * @param {shaka.extern.Stream} s0
    * @param {shaka.extern.Stream} s1
@@ -880,6 +900,11 @@ shaka.util.StreamUtils = class {
     /** @type {?shaka.extern.Stream} */
     const video = variant.video;
 
+    /** @type {?string} */
+    const audioMimeType = audio ? audio.mimeType : null;
+    /** @type {?string} */
+    const videoMimeType = video ? video.mimeType : null;
+
     /** @type {?string} */
     const audioCodec = audio ? audio.codecs : null;
     /** @type {?string} */
@@ -944,6 +969,8 @@ shaka.util.StreamUtils = class {
       pixelAspectRatio: null,
       hdr: null,
       mimeType: mimeType,
+      audioMimeType: audioMimeType,
+      videoMimeType: videoMimeType,
       codecs: codecs.join(', '),
       audioCodec: audioCodec,
       videoCodec: videoCodec,
@@ -1011,6 +1038,8 @@ shaka.util.StreamUtils = class {
       pixelAspectRatio: null,
       hdr: null,
       mimeType: stream.mimeType,
+      audioMimeType: null,
+      videoMimeType: null,
       codecs: stream.codecs || null,
       audioCodec: null,
       videoCodec: null,
@@ -1083,6 +1112,8 @@ shaka.util.StreamUtils = class {
       pixelAspectRatio: null,
       hdr: null,
       mimeType: stream.mimeType,
+      audioMimeType: null,
+      videoMimeType: null,
       codecs: null,
       audioCodec: null,
       videoCodec: null,
@@ -1201,6 +1232,8 @@ shaka.util.StreamUtils = class {
       pixelAspectRatio: null,
       hdr: null,
       mimeType: null,
+      audioMimeType: null,
+      videoMimeType: null,
       codecs: null,
       audioCodec: null,
       videoCodec: null,
@@ -1505,3 +1538,40 @@ shaka.util.StreamUtils.DecodingAttributes = {
   POWER: 'powerEfficient',
   BANDWIDTH: 'bandwidth',
 };
+
+/**
+ * @private {!Map.<string, boolean>}
+ */
+shaka.util.StreamUtils.supportedImageMimeTypes_ = new Map()
+    .set('image/svg+xml', true)
+    .set('image/png', true)
+    .set('image/jpeg', true)
+    .set('image/jpg', true);
+
+/**
+ * @const {string}
+ * @private
+ */
+shaka.util.StreamUtils.minWebPImage_ = 'data:image/webp;base64,UklGRjoAAABXRU' +
+    'JQVlA4IC4AAACyAgCdASoCAAIALmk0mk0iIiIiIgBoSygABc6WWgAA/veff/0PP8bA//LwY' +
+    'AAA';
+
+/**
+ * @const {string}
+ * @private
+ */
+shaka.util.StreamUtils.minAvifImage_ = 'data:image/avif;base64,AAAAIGZ0eXBhdm' +
+    'lmAAAAAGF2aWZtaWYxbWlhZk1BMUIAAADybWV0YQAAAAAAAAAoaGRscgAAAAAAAAAAcGljd' +
+    'AAAAAAAAAAAAAAAAGxpYmF2aWYAAAAADnBpdG0AAAAAAAEAAAAeaWxvYwAAAABEAAABAAEA' +
+    'AAABAAABGgAAAB0AAAAoaWluZgAAAAAAAQAAABppbmZlAgAAAAABAABhdjAxQ29sb3IAAAA' +
+    'AamlwcnAAAABLaXBjbwAAABRpc3BlAAAAAAAAAAIAAAACAAAAEHBpeGkAAAAAAwgICAAAAA' +
+    'xhdjFDgQ0MAAAAABNjb2xybmNseAACAAIAAYAAAAAXaXBtYQAAAAAAAAABAAEEAQKDBAAAA' +
+    'CVtZGF0EgAKCBgANogQEAwgMg8f8D///8WfhwB8+ErK42A=';
+
+/**
+ * @const {!Map.<string, string>}
+ * @private
+ */
+shaka.util.StreamUtils.minImage_ = new Map()
+    .set('image/webp', shaka.util.StreamUtils.minWebPImage_)
+    .set('image/avif', shaka.util.StreamUtils.minAvifImage_);

package/lib/util/uint8array_utils.js

@@ -6,7 +6,6 @@
 
 goog.provide('shaka.util.Uint8ArrayUtils');
 
-goog.require('shaka.Deprecate');
 goog.require('shaka.util.BufferUtils');
 goog.require('shaka.util.StringUtils');
 
@@ -17,21 +16,6 @@ goog.require('shaka.util.StringUtils');
  * @export
  */
 shaka.util.Uint8ArrayUtils = class {
-  /**
-   * Compare two Uint8Arrays for equality.
-   * @param {Uint8Array} arr1
-   * @param {Uint8Array} arr2
-   * @return {boolean}
-   * @deprecated
-   * @export
-   */
-  static equal(arr1, arr2) {
-    shaka.Deprecate.deprecateFeature(4,
-        'shaka.util.Uint8ArrayUtils.equal',
-        'Please use shaka.util.BufferUtils.equal instead.');
-    return shaka.util.BufferUtils.equal(arr1, arr2);
-  }
-
   /**
    * Convert a buffer to a base64 string. The output will be standard
    * alphabet as opposed to base64url safe alphabet.

package/lib/util/xml_utils.js

@@ -199,7 +199,7 @@ shaka.util.XmlUtils = class {
     }
 
     const result = Date.parse(dateString);
-    return (!isNaN(result) ? Math.floor(result / 1000.0) : null);
+    return isNaN(result) ? null : (result / 1000.0);
   }
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "3.3.5",
+  "version": "4.0.2",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -50,7 +50,7 @@
     "less": "https://gitpkg.now.sh/joeyparrish/less.js/packages/less?28c63a43",
     "less-plugin-clean-css": "github:austingardner/less-plugin-clean-css#4e9e77bf",
     "material-design-lite": "^1.3.0",
-    "mux.js": "^5.14.1",
+    "mux.js": "^6.1.0",
     "open-sans-fonts": "^1.6.2",
     "postcss-less": "^6.0.0",
     "pwacompat": "^2.0.17",
@@ -97,5 +97,8 @@
   },
   "dependencies": {
     "eme-encryption-scheme-polyfill": "^2.0.3"
+  },
+  "engines": {
+    "node": ">=14"
   }
 }

package/roadmap.md

@@ -9,41 +9,41 @@ The goals of future milestones are fluid until we begin that development cycle,
 so the exact milestone for future features is not pre-determined.
 
 Priority features up next:
- - Support containerless formats
-   https://github.com/shaka-project/shaka-player/issues/2337
  - Preload API
    https://github.com/shaka-project/shaka-player/issues/880
- - Codec-switching and order preference
-   https://github.com/shaka-project/shaka-player/issues/1528
-   https://github.com/shaka-project/shaka-player/issues/2179
 
 Candidate features for future release cycles:
- - HLS interstitial support
-   https://github.com/shaka-project/shaka-player/issues/3364
- - Support ID3 tags in mp4
-   https://github.com/shaka-project/shaka-player/issues/3351
- - MSE support for FairPlay
-   https://github.com/shaka-project/shaka-player/issues/3346
- - Smaller, more modular binary
  - Official TypeScript defs, generated from source
    https://github.com/shaka-project/shaka-player/issues/1030
- - Shaka Analytics Component and an integration with BigQuery Analytics
-   https://github.com/shaka-project/shaka-player/issues/3359
- - Integration with Google Video ML/Cloud AI
-
-v3.3 - 2021 Q3 or Q4
+ - Codec-switching
+   https://github.com/shaka-project/shaka-player/issues/1528
  - Background fetch for offline storage
    https://github.com/shaka-project/shaka-player/issues/879
- - HLS performance improvements
-   https://github.com/shaka-project/shaka-player/issues/3363
+ - Support ID3 tags in mp4
+   https://github.com/shaka-project/shaka-player/issues/3351
+ - Smaller, more modular binary
+
+v3.4 - 2022 Q1 or Q2
+ - MSE support for FairPlay
+   https://github.com/shaka-project/shaka-player/issues/3346
+ - Support containerless formats
+   https://github.com/shaka-project/shaka-player/issues/2337
 
 =====
 
+v3.3 - 2022 Q1
+ - Common Media Client Data (CMCD) logging support
+   https://github.com/shaka-project/shaka-player/issues/3619
+ - Non-linear IMA CS ads
+   https://github.com/shaka-project/shaka-player/pull/3639
+
 v3.2 - 2021 Q3
  - MediaCapabilities to make performance-based decisions
    https://github.com/shaka-project/shaka-player/issues/1391
  - Configurable key-system priority
    https://github.com/shaka-project/shaka-player/issues/3002
+ - Codec order preferences
+   https://github.com/shaka-project/shaka-player/issues/2179
 
 v3.1 - 2021 Q2
  - Low-latency live (LL-HLS, LL-DASH)

package/shaka-player.uncompiled.js

@@ -35,12 +35,9 @@ goog.require('shaka.offline.indexeddb.StorageMechanism');
 goog.require('shaka.polyfill.Aria');
 goog.require('shaka.polyfill.EncryptionScheme');
 goog.require('shaka.polyfill.Fullscreen');
-goog.require('shaka.polyfill.MathRound');
 goog.require('shaka.polyfill.MediaSource');
 goog.require('shaka.polyfill.MediaCapabilities');
 goog.require('shaka.polyfill.Orientation');
-goog.require('shaka.polyfill.PatchedMediaKeysApple');
-goog.require('shaka.polyfill.PatchedMediaKeysMs');
 goog.require('shaka.polyfill.PatchedMediaKeysNop');
 goog.require('shaka.polyfill.PatchedMediaKeysWebkit');
 goog.require('shaka.polyfill.PiPWebkit');

package/test/dash/dash_parser_content_protection_unit.js

@@ -805,6 +805,50 @@ describe('DashParser ContentProtection', () => {
     });
   });
 
+  describe('getClearKeyLicenseUrl', () => {
+    it('valid clearkey:Laurl node', () => {
+      const input = {
+        init: null,
+        keyId: null,
+        schemeUri: '',
+        node: strToXml([
+          '<test xmlns:clearkey="http://dashif.org/guidelines/clearKey">',
+          '  <clearkey:Laurl ',
+          '     Lic_type="EME-1.0">www.example.com</clearkey:Laurl>',
+          '</test>',
+        ].join('\n')),
+      };
+      const actual = ContentProtection.getClearKeyLicenseUrl(input);
+      expect(actual).toBe('www.example.com');
+    });
+
+    it('clearkey:Laurl without license url', () => {
+      const input = {
+        init: null,
+        keyId: null,
+        schemeUri: '',
+        node: strToXml([
+          '<test xmlns:clearkey="http://dashif.org/guidelines/clearKey">',
+          '  <clearkey:Laurl Lic_type="EME-1.0"></clearkey:Laurl>',
+          '</test>',
+        ].join('\n')),
+      };
+      const actual = ContentProtection.getClearKeyLicenseUrl(input);
+      expect(actual).toBe('');
+    });
+
+    it('no clearkey:Laurl node', () => {
+      const input = {
+        init: null,
+        keyId: null,
+        schemeUri: '',
+        node: strToXml('<test></test>'),
+      };
+      const actual = ContentProtection.getClearKeyLicenseUrl(input);
+      expect(actual).toBe('');
+    });
+  });
+
   describe('getPlayReadyLicenseURL', () => {
     it('mspro', () => {
       const laurl = [

package/test/dash/dash_parser_segment_template_unit.js

@@ -106,9 +106,8 @@ describe('DashParser SegmentTemplate', () => {
           's2.mp4', 50, 60, baseUri);
       expectedRef2.timestampOffset = -10;
 
-      const iterator = stream.segmentIndex[Symbol.iterator]();
-      const ref1 = iterator.seek(45);
-      const ref2 = iterator.seek(55);
+      const ref1 = stream.segmentIndex.getIteratorForTime(45).next().value;
+      const ref2 = stream.segmentIndex.getIteratorForTime(55).next().value;
       expect(ref1).toEqual(expectedRef1);
       expect(ref2).toEqual(expectedRef2);
     });
@@ -445,7 +444,7 @@ describe('DashParser SegmentTemplate', () => {
       await variants[2].video.createSegmentIndex();
 
       const getRefAt = (stream, time) => {
-        return stream.segmentIndex[Symbol.iterator]().seek(time);
+        return stream.segmentIndex.getIteratorForTime(time).next().value;
       };
 
       expect(getRefAt(variants[0].video, 0)).toEqual(

package/test/demo/demo_unit.js

@@ -93,7 +93,8 @@ describe('Demo', () => {
           .add('preferredVariantRole')
           .add('playRangeStart')
           .add('playRangeEnd')
-          .add('manifest.dash.keySystemsByURI');
+          .add('manifest.dash.keySystemsByURI')
+          .add('manifest.hls.mediaPlaylistFullMimeType');
 
       /**
        * @param {!Object} section