shaka-player 3.3.4 → 4.0.0

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.4",
+  "version": "4.0.0",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [

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/cast/cast_utils_unit.js

@@ -189,6 +189,7 @@ describe('CastUtils', () => {
         const fakeVideoStream = {
           mimeType: 'video/mp4',
           codecs: 'avc1.42c01e',
+          drmInfos: [],
         };
         const initSegmentUrl = '/base/test/test/assets/sintel-video-init.mp4';
         const videoSegmentUrl =

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_manifest_unit.js

@@ -447,30 +447,6 @@ describe('DashParser Manifest', () => {
         expect(stream.closedCaptions).toEqual(expectedClosedCaptions);
       });
 
-  it('Detects E-AC3 JOC content by SupplementalProperty', async () => {
-    const idUri = 'tag:dolby.com,2018:dash:EC3_ExtensionType:2018';
-    const source = [
-      '<MPD>',
-      '  <Period duration="PT30M">',
-      '    <AdaptationSet mimeType="audio/mp4" lang="\u2603">',
-      '      <Representation bandwidth="500">',
-      '        <SupplementalProperty schemeIdUri="' + idUri + '" value="JOC"/>',
-      '        <BaseURL>http://example.com</BaseURL>',
-      '        <SegmentTemplate media="2.mp4" duration="1" />',
-      '      </Representation>',
-      '    </AdaptationSet>',
-      '  </Period>',
-      '</MPD>',
-    ].join('\n');
-
-    fakeNetEngine.setResponseText('dummy://foo', source);
-
-    /** @type {shaka.extern.Manifest} */
-    const manifest = await parser.start('dummy://foo', playerInterface);
-    const stream = manifest.variants[0].audio;
-    expect(stream.mimeType).toBe('audio/eac3-joc');
-  });
-
   it('Detects spatial audio', async () => {
     const idUri = 'tag:dolby.com,2018:dash:EC3_ExtensionType:2018';
     const source = [

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