shaka-player 4.3.10 → 4.4.0

package/test/polyfill/media_capabilities_unit.js

@@ -163,6 +163,24 @@ describe('MediaCapabilities', () => {
           expect(result.keySystemAccess).toEqual(mockResult);
         });
 
+    it('should read previously requested codec/key system'+
+        'combinations from cache', async () => {
+      const mockResult = {mockKeySystemAccess: 'mockKeySystemAccess'};
+      spyOn(window['MediaSource'], 'isTypeSupported').and.returnValue(true);
+      const requestKeySystemAccessSpy =
+          spyOn(window['navigator'],
+              'requestMediaKeySystemAccess').and.returnValue(mockResult);
+
+      shaka.polyfill.MediaCapabilities.install();
+      await navigator.mediaCapabilities
+          .decodingInfo(mockDecodingConfig);
+      await navigator.mediaCapabilities
+          .decodingInfo(mockDecodingConfig);
+
+      expect(requestKeySystemAccessSpy)
+          .toHaveBeenCalledTimes(1);
+    });
+
     it('falls back to isTypeSupported() when cast namespace is not available',
         async () => {
           // Temporarily remove window.cast to trigger error. It's restored

package/test/test/assets/hls-raw-aac/manifest.m3u8

@@ -0,0 +1,4 @@
+#EXTM3U
+
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=41457,CODECS="mp4a.40.2"
+stream.m4a.m3u8

package/test/test/assets/hls-raw-aac/stream.m4a.m3u8

@@ -0,0 +1,14 @@
+#EXTM3U
+#EXT-X-TARGETDURATION:11
+#EXT-X-VERSION:3
+#EXT-X-MEDIA-SEQUENCE:0
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXTINF:9.98458,	
+fileSequence0.aac
+#EXTINF:9.98458,	
+fileSequence1.aac
+#EXTINF:9.98459,	
+fileSequence2.aac
+#EXTINF:10.03102,	
+fileSequence3.aac
+#EXT-X-ENDLIST

package/test/test/assets/hls-raw-ac3/prog_index.m3u8

@@ -0,0 +1,31 @@
+#EXTM3U
+#EXT-X-TARGETDURATION:6
+#EXT-X-VERSION:3
+#EXT-X-MEDIA-SEQUENCE:0
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-INDEPENDENT-SEGMENTS
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:384
+fileSequence0.ac3
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:384
+fileSequence1.ac3
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:384
+fileSequence2.ac3
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:384
+fileSequence3.ac3
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:384
+fileSequence4.ac3
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:384
+fileSequence5.ac3
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:384
+fileSequence6.ac3
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:384
+fileSequence7.ac3
+#EXT-X-ENDLIST

package/test/test/assets/hls-raw-ec3/prog_index.m3u8

@@ -0,0 +1,31 @@
+#EXTM3U
+#EXT-X-TARGETDURATION:6
+#EXT-X-VERSION:3
+#EXT-X-MEDIA-SEQUENCE:0
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-INDEPENDENT-SEGMENTS
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:192
+fileSequence0.ec3
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:192
+fileSequence1.ec3
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:192
+fileSequence2.ec3
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:192
+fileSequence3.ec3
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:192
+fileSequence4.ec3
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:192
+fileSequence5.ec3
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:192
+fileSequence6.ec3
+#EXTINF:5.98400,	
+#EXT-X-BITRATE:192
+fileSequence7.ec3
+#EXT-X-ENDLIST

package/test/test/assets/hls-raw-mp3/chunklist_w905519204.m3u8

@@ -0,0 +1,13 @@
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-TARGETDURATION:10
+#EXT-X-MEDIA-SEQUENCE:0
+#EXTINF:10.0,
+media_w905519204_0.mp3
+#EXTINF:10.0,
+media_w905519204_1.mp3
+#EXTINF:10.0,
+media_w905519204_2.mp3
+#EXTINF:10.0,
+media_w905519204_3.mp3
+#EXT-X-ENDLIST

package/test/test/assets/hls-raw-mp3/playlist.m3u8

@@ -0,0 +1,4 @@
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-STREAM-INF:BANDWIDTH=63701,CODECS="mp4a.40.34"
+chunklist_w905519204.m3u8

package/test/test/assets/hls-ts-aac/playlist.m3u8

@@ -0,0 +1,23 @@
+#EXTM3U
+
+#EXT-X-VERSION:3
+#EXT-X-MEDIA-SEQUENCE:0
+#EXT-X-TARGETDURATION:4
+
+#EXTINF:3.989
+segment_0.ts
+#EXTINF:3.989
+segment_1.ts
+#EXTINF:3.989
+segment_2.ts
+#EXTINF:3.989
+segment_3.ts
+#EXTINF:3.989
+segment_4.ts
+#EXTINF:3.989
+segment_5.ts
+#EXTINF:3.989
+segment_6.ts
+#EXTINF:3.989
+segment_7.ts
+#EXT-X-ENDLIST

package/test/test/assets/hls-ts-ac3/prog_index.m3u8

@@ -0,0 +1,19 @@
+#EXTM3U
+#EXT-X-VERSION:4
+#EXT-X-TARGETDURATION:6
+#EXT-X-MEDIA-SEQUENCE:0
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-INDEPENDENT-SEGMENTS
+#EXTINF:6.016,
+ChID_voices_6ch_640kbps_dd_sub_0000.ts
+#EXTINF:5.984,
+ChID_voices_6ch_640kbps_dd_sub_0001.ts
+#EXTINF:6.016,
+ChID_voices_6ch_640kbps_dd_sub_0002.ts
+#EXTINF:5.984,
+ChID_voices_6ch_640kbps_dd_sub_0003.ts
+#EXTINF:6.016,
+ChID_voices_6ch_640kbps_dd_sub_0004.ts
+#EXTINF:5.984,
+ChID_voices_6ch_640kbps_dd_sub_0005.ts
+#EXT-X-ENDLIST

package/test/test/assets/hls-ts-ec3/prog_index.m3u8

@@ -0,0 +1,19 @@
+#EXTM3U
+#EXT-X-VERSION:4
+#EXT-X-TARGETDURATION:6
+#EXT-X-MEDIA-SEQUENCE:0
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-INDEPENDENT-SEGMENTS
+#EXTINF:6.016,
+ChID_voices_6ch_256kbps_ddp_sub_0000.ts
+#EXTINF:5.984,
+ChID_voices_6ch_256kbps_ddp_sub_0001.ts
+#EXTINF:6.016,
+ChID_voices_6ch_256kbps_ddp_sub_0002.ts
+#EXTINF:5.984,
+ChID_voices_6ch_256kbps_ddp_sub_0003.ts
+#EXTINF:6.016,
+ChID_voices_6ch_256kbps_ddp_sub_0004.ts
+#EXTINF:5.984,
+ChID_voices_6ch_256kbps_ddp_sub_0005.ts
+#EXT-X-ENDLIST

package/test/test/assets/hls-ts-h264/prog_index.m3u8

@@ -0,0 +1,25 @@
+#EXTM3U
+#EXT-X-TARGETDURATION:6
+#EXT-X-VERSION:3
+#EXT-X-MEDIA-SEQUENCE:0
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-INDEPENDENT-SEGMENTS
+#EXTINF:6.00000,	
+#EXT-X-BITRATE:377
+fileSequence0.ts
+#EXTINF:6.00000,	
+#EXT-X-BITRATE:385
+fileSequence1.ts
+#EXTINF:6.00000,	
+#EXT-X-BITRATE:388
+fileSequence2.ts
+#EXTINF:6.00000,	
+#EXT-X-BITRATE:378
+fileSequence3.ts
+#EXTINF:6.00000,	
+#EXT-X-BITRATE:378
+fileSequence4.ts
+#EXTINF:6.00000,	
+#EXT-X-BITRATE:372
+fileSequence5.ts
+#EXT-X-ENDLIST

package/test/test/assets/hls-ts-mp3/manifest.m3u8

@@ -0,0 +1,13 @@
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-TARGETDURATION:10
+#EXT-X-MEDIA-SEQUENCE:0
+#EXTINF:10.0,
+media_w239891843_0.ts
+#EXTINF:10.0,
+media_w239891843_1.ts
+#EXTINF:10.0,
+media_w239891843_2.ts
+#EXTINF:10.0,
+media_w239891843_3.ts
+#EXT-X-ENDLIST

package/test/test/assets/hls-ts-muxed-aac-h264/chunk.m3u8

@@ -0,0 +1,17 @@
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-TARGETDURATION:7
+#EXT-X-MEDIA-SEQUENCE:0
+#EXTINF:6,
+n_0_0_0.ts
+#EXTINF:6,
+n_1_0_0.ts
+#EXTINF:6,
+n_2_0_0.ts
+#EXTINF:6,
+n_3_0_0.ts
+#EXTINF:6,
+n_4_0_0.ts
+#EXTINF:6,
+n_5_0_0.ts
+#EXT-X-ENDLIST

package/test/test/assets/hls-ts-muxed-aac-h264/playlist.m3u8

@@ -0,0 +1,4 @@
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-STREAM-INF:BANDWIDTH=1225016,CODECS="avc1.42c00d,mp4a.40.2",RESOLUTION=320x180
+chunk.m3u8

package/test/test/boot.js

@@ -349,11 +349,16 @@ function configureJasmineEnvironment() {
     });
   }
 
+  // Reset decoding config cache after each test.
+  afterEach(/** @suppress {accessControls} */ () => {
+    shaka.util.StreamUtils.decodingConfigCache_ = {};
+  });
+
   // Code in karma-jasmine's adapter will malform test failures when the
   // expectation message contains a stack trace, losing the failure message and
   // mixing up the stack trace of the failure.  To avoid this, we modify
-  // shaka.util.Error not to create a stack trace.  This trace is not available
-  // in production, and there is never any need for it in the tests.
+  // shaka.util.Error not to create a stack trace.  There is never any need for
+  // this trace in the tests.
   // Shimming shaka.util.Error proved too complicated because of a combination
   // of compiler restrictions and ES6 language features, so this is by far the
   // simpler answer.

package/test/test/util/fake_ad.js

@@ -40,6 +40,33 @@ shaka.test.FakeAd = class {
 
     /** @private {string} */
     this.description_ = 'Test Description';
+
+    /** @private {number} */
+    this.vastMediaBitrate_ = 128;
+
+    /** @private {number} */
+    this.vastMediaHeight_ = 720;
+
+    /** @private {number} */
+    this.vastMediaWidth_ = 1280;
+
+    /** @private {string} */
+    this.adId_ = 'Test Ad ID';
+
+    /** @private {string} */
+    this.creativeAdId_ = 'Test Creative Ad ID';
+
+    /** @private {string} */
+    this.advertiserName_ = '';
+
+    /** @private {string} */
+    this.mediaUrl_ = 'fake';
+
+    /** @private {number} */
+    this.timeOffsetInPod_ = 1;
+
+    /** @private {number} */
+    this.podIndex_ = 1;
   }
 
   /**
@@ -212,6 +239,78 @@ shaka.test.FakeAd = class {
     return this.description_;
   }
 
+  /**
+   * @override
+   * @export
+   */
+  getVastMediaBitrate() {
+    return this.vastMediaBitrate_;
+  }
+
+  /**
+   * @override
+   * @export
+   */
+  getVastMediaHeight() {
+    return this.vastMediaHeight_;
+  }
+
+  /**
+   * @override
+   * @export
+   */
+  getVastMediaWidth() {
+    return this.vastMediaWidth_;
+  }
+
+  /**
+   * @override
+   * @export
+   */
+  getAdId() {
+    return this.adId_;
+  }
+
+  /**
+   * @override
+   * @export
+   */
+  getCreativeAdId() {
+    return this.creativeAdId_;
+  }
+
+  /**
+   * @override
+   * @export
+   */
+  getAdvertiserName() {
+    return this.advertiserName_;
+  }
+
+  /**
+   * @override
+   * @export
+   */
+  getMediaUrl() {
+    return this.mediaUrl_;
+  }
+
+  /**
+   * @override
+   * @export
+   */
+  getTimeOffset() {
+    return this.timeOffsetInPod_;
+  }
+
+  /**
+   * @override
+   * @export
+   */
+  getPodIndex() {
+    return this.podIndex_;
+  }
+
   /**
    * @override
    * @export

package/test/test/util/fake_ad_manager.js

@@ -23,7 +23,10 @@ shaka.test.FakeAdManager = class extends shaka.util.FakeEventTarget {
   setLocale(locale) {}
 
   /** @override */
-  initClientSide(adContainer, video) {}
+  configure(config) {}
+
+  /** @override */
+  initClientSide(adContainer, video, adsRenderingSettings) {}
 
   /** @override */
   onAssetUnload() {}
@@ -33,6 +36,9 @@ shaka.test.FakeAdManager = class extends shaka.util.FakeEventTarget {
     return Promise.resolve('fake:url');
   }
 
+  /** @override */
+  updateClientSideAdsRenderingSettings(adsRenderingSettings) {}
+
   /** @override */
   initServerSide(adContainer, video) {}