shaka-player 4.4.3 → 4.6.0

package/test/test/assets/dash-aes-128/dash.mpd

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MPD mediaPresentationDuration="PT0M8.000S" minBufferTime="PT1S" profiles="urn:mpeg:dash:profile:isoff-live:2011" type="static" xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:sea="urn:mpeg:dash:schema:sea:2012" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Period>
+    <AdaptationSet bitstreamSwitching="false" codecs="avc1.64000D" contentType="video" group="1" id="1" maxHeight="136" maxWidth="320" mimeType="video/mp4" profiles="ccff" segmentAlignment="true" startWithSAP="1">
+      <ContentProtection schemeIdUri="urn:mpeg:dash:sea:2012">
+        <sea:SegmentEncryption schemeIdUri="urn:mpeg:dash:sea:aes128-cbc:2013"/>
+        <sea:KeySystem keySystemUri="urn:mpeg:dash:sea:keysys:http:2013"/>
+        <sea:CryptoPeriod IV="0x3782A2D74219AE78CFADF642ABC5E68D" keyUriTemplate="license"/>
+      </ContentProtection>
+      <SegmentTemplate initialization="Fragments(video=i,format=mpd-time-csf)" media="Fragments(video=$Time$,format=mpd-time-csf)" timescale="10000000">
+        <SegmentTimeline>
+          <S d="20000000" r="4"/>
+        </SegmentTimeline>
+      </SegmentTemplate>
+      <Representation bandwidth="395367" codecs="avc1.64000D" height="136" id="1_V_video_8" width="320"/>
+    </AdaptationSet>
+  </Period>
+</MPD>

package/test/test/assets/dash-aes-128/license

@@ -0,0 +1 @@
+�W祽Vv՛���:$�

package/test/test/assets/dash-multi-codec/dash.mpd

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generated with https://github.com/google/shaka-packager version v2.4.1-c731217-release-->
+<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT60S">
+  <Period id="0">
+    <AdaptationSet id="6" contentType="video" maxWidth="180" maxHeight="144" frameRate="12800/512" par="5:4">
+      <Representation id="12" bandwidth="162364" codecs="avc1.4d400c" mimeType="video/mp4" sar="1:1" width="180" height="144">
+        <BaseURL>video_144p_108k_h264.mp4</BaseURL>
+        <SegmentBase indexRange="860-1071" timescale="12800">
+          <Initialization range="0-859"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+    <AdaptationSet id="8" contentType="audio" lang="en" subsegmentAlignment="true">
+      <Representation id="13" bandwidth="130803" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="48000">
+        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
+        <BaseURL>audio_en_2c_128k_aac.mp4</BaseURL>
+        <SegmentBase indexRange="786-1009" timescale="48000">
+          <Initialization range="0-785"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+    <AdaptationSet id="10" contentType="audio" lang="es" subsegmentAlignment="true">
+      <Representation id="17" bandwidth="75654" codecs="opus" mimeType="audio/webm" audioSamplingRate="48000">
+        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
+        <BaseURL>audio_es_2c_64k_opus.webm</BaseURL>
+        <SegmentBase indexRange="326-584" timescale="48000">
+          <Initialization range="0-325"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+  </Period>
+</MPD>

package/test/test/assets/hls-ts-h265/hevc.m3u8

@@ -0,0 +1,6 @@
+#EXTM3U
+#EXT-X-VERSION:6
+#EXT-X-INDEPENDENT-SEGMENTS
+
+#EXT-X-STREAM-INF:AVERAGE-BANDWIDTH=829339,BANDWIDTH=901770,CODECS="hvc1.2.4.L123.B0",RESOLUTION=640x360,FRAME-RATE=30.000
+index.m3u8

package/test/test/assets/hls-ts-h265/index.m3u8

@@ -0,0 +1,7 @@
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-TARGETDURATION:12
+#EXT-X-MEDIA-SEQUENCE:0
+#EXTINF:12.000000,
+0.ts
+#EXT-X-ENDLIST

package/test/test/assets/hls-ts-muxed-aac-h265/media.m3u8

@@ -0,0 +1,9 @@
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-TARGETDURATION:5
+#EXT-X-MEDIA-SEQUENCE:0
+#EXTINF:5.000000,
+0.ts
+#EXTINF:5.000000,
+1.ts
+#EXT-X-ENDLIST

package/test/test/assets/hls-ts-muxed-ac3-h264/media.m3u8

@@ -0,0 +1,24 @@
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-INDEPENDENT-SEGMENTS
+#EXT-X-TARGETDURATION:4
+#EXT-X-MEDIA-SEQUENCE:0
+#EXTINF:3.000000,
+s_00000.ts
+
+#EXTINF:3.000000,
+s_00001.ts
+
+#EXTINF:3.000000,
+s_00002.ts
+
+#EXTINF:3.000000,
+s_00003.ts
+
+#EXTINF:3.000000,
+s_00004.ts
+
+#EXTINF:3.000000,
+s_00005.ts
+
+#EXT-X-ENDLIST

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

@@ -0,0 +1,14 @@
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-TARGETDURATION:6
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-INDEPENDENT-SEGMENTS
+#EXTINF:6.000,
+ChID_voices_1280x720p_25fps_h264_6ch_256kbps_ddp_sub_0000.ts
+#EXTINF:6.000,
+ChID_voices_1280x720p_25fps_h264_6ch_256kbps_ddp_sub_0001.ts
+#EXTINF:6.000,
+ChID_voices_1280x720p_25fps_h264_6ch_256kbps_ddp_sub_0002.ts
+#EXTINF:6.000,
+ChID_voices_1280x720p_25fps_h264_6ch_256kbps_ddp_sub_0003.ts
+#EXT-X-ENDLIST

package/test/test/assets/hls-ts-muxed-mp3-h264/index.m3u8

@@ -0,0 +1,23 @@
+#EXTM3U
+#EXT-X-TARGETDURATION:6
+#EXT-X-ALLOW-CACHE:YES
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-VERSION:3
+#EXT-X-MEDIA-SEQUENCE:1
+#EXTINF:2.436,
+seg-1-v1-a1.ts
+#EXTINF:3.337,
+seg-2-v1-a1.ts
+#EXTINF:3.337,
+seg-3-v1-a1.ts
+#EXTINF:5.005,
+seg-4-v1-a1.ts
+#EXTINF:5.005,
+seg-5-v1-a1.ts
+#EXTINF:5.005,
+seg-6-v1-a1.ts
+#EXTINF:5.606,
+seg-7-v1-a1.ts
+#EXTINF:5.005,
+seg-8-v1-a1.ts
+#EXT-X-ENDLIST

package/test/test/util/dash_parser_util.js

@@ -45,6 +45,8 @@ shaka.test.Dash = class {
       enableLowLatencyMode: () => {},
       updateDuration: () => {},
       newDrmInfo: (stream) => {},
+      onManifestUpdated: () => {},
+      getBandwidthEstimate: () => 1e6,
     };
     try {
       const manifest = await dashParser.start('dummy://foo', playerInterface);
@@ -85,6 +87,8 @@ shaka.test.Dash = class {
       enableLowLatencyMode: () => {},
       updateDuration: () => {},
       newDrmInfo: (stream) => {},
+      onManifestUpdated: () => {},
+      getBandwidthEstimate: () => 1e6,
     };
 
     try {

package/test/test/util/fake_ad_manager.js

@@ -39,6 +39,14 @@ shaka.test.FakeAdManager = class extends shaka.util.FakeEventTarget {
   /** @override */
   updateClientSideAdsRenderingSettings(adsRenderingSettings) {}
 
+  /** @override */
+  initMediaTailor(networkingEngine, video) {}
+
+  /** @override */
+  requestMediaTailorStream(url, adsParams, backupUrl) {
+    return Promise.resolve('fake:url');
+  }
+
   /** @override */
   initServerSide(adContainer, video) {}
 
@@ -57,11 +65,23 @@ shaka.test.FakeAdManager = class extends shaka.util.FakeEventTarget {
     return [];
   }
 
+  /**
+   * @override
+   */
+  getCuePoints() {
+    return [];
+  }
+
   /** @override */
   getStats() {
     return this.stats_;
   }
 
+  /**
+   * @override
+   */
+  onManifestUpdated(isLive) {}
+
   /**
    * @override
    */

package/test/test/util/fake_media_source_engine.js

@@ -134,8 +134,8 @@ shaka.test.FakeMediaSourceEngine = class {
         jasmine.createSpy('setSegmentRelativeVttTiming').and.stub();
 
     /** @type {!jasmine.Spy} */
-    this.updateLcevcDil =
-        jasmine.createSpy('updateLcevcDil').and.stub();
+    this.updateLcevcDec =
+        jasmine.createSpy('updateLcevcDec').and.stub();
 
     /** @type {!jasmine.Spy} */
     this.resync=
@@ -147,6 +147,11 @@ shaka.test.FakeMediaSourceEngine = class {
     return Promise.resolve();
   }
 
+  /** @override */
+  isStreamingAllowed() {
+    return true;
+  }
+
   /**
    * @param {string} type
    * @return {?number}
@@ -341,6 +346,12 @@ shaka.test.FakeMediaSourceEngine = class {
     return Promise.resolve();
   }
 
+
+  /** @override */
+  isResetMediaSourceNecessary() {
+    return false;
+  }
+
   /**
    * @param {string} type
    * @return {!Promise}

package/test/test/util/fake_networking_engine.js

@@ -49,6 +49,9 @@ shaka.test.FakeNetworkingEngine = class {
     /** @type {!jasmine.Spy} */
     this.setForceHTTPS = jasmine.createSpy('setForceHTTPS').and.stub();
 
+    /** @private {number} */
+    this.maxUris_ = 1;
+
     // The prototype has already been applied; create spies for the
     // methods but still call it by default.
     spyOn(this, 'destroy').and.callThrough();
@@ -67,7 +70,7 @@ shaka.test.FakeNetworkingEngine = class {
    */
   requestImpl_(type, request) {
     expect(request).toBeTruthy();
-    expect(request.uris.length).toBe(1);
+    expect(request.uris.length).toBeLessThanOrEqual(this.maxUris_);
 
     const requestedUri = request.uris[0];
 
@@ -288,6 +291,11 @@ shaka.test.FakeNetworkingEngine = class {
     return this;
   }
 
+  setMaxUris(maxUris) {
+    this.maxUris_ = maxUris;
+    return this;
+  }
+
   /**
    * Expects that a request for the given segment has occurred.
    *

package/test/test/util/fake_segment_prefetch.js

@@ -78,4 +78,7 @@ shaka.test.FakeSegmentPrefetch = class {
     }
     return null;
   }
+
+  /** @override */
+  prefetchInitSegment(reference) {}
 };

package/test/test/util/manifest_generator.js

@@ -459,9 +459,11 @@ shaka.test.ManifestGenerator.Stream = class {
    * @param {string=} label
    */
   constructor(manifest, isPartial, id, type, lang, label) {
-    goog.asserts.assert(
-        !manifest || !manifest.isIdUsed_(id),
-        'Streams should have unique ids!');
+    // variants can be made up of different combinations of video
+    // and audio streams
+    // goog.asserts.assert(
+    //     !manifest || !manifest.isIdUsed_(id),
+    //     'Streams should have unique ids!');
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
     /** @const {shaka.test.ManifestGenerator.Manifest} */
@@ -499,6 +501,8 @@ shaka.test.ManifestGenerator.Stream = class {
 
       /** @type {?string} */
       this.originalId = null;
+      /** @type {?string} */
+      this.groupId = null;
       /** @type {shaka.extern.CreateSegmentIndexFunction} */
       this.createSegmentIndex = shaka.test.Util.spyFunc(create);
       /** @type {shaka.media.SegmentIndex} */
@@ -552,11 +556,15 @@ shaka.test.ManifestGenerator.Stream = class {
       /** @type {(string|undefined)} */
       this.hdr = undefined;
       /** @type {(string|undefined)} */
+      this.videoLayout = undefined;
+      /** @type {(string|undefined)} */
       this.tilesLayout = undefined;
       /** @type {?shaka.media.ManifestParser.AccessibilityPurpose} */
       this.accessibilityPurpose;
       /** @type {boolean} */
       this.external = false;
+      /** @type {boolean} */
+      this.fastSwitching = false;
     }
 
     /** @type {shaka.extern.Stream} */

package/test/test/util/manifest_parser_util.js

@@ -42,7 +42,7 @@ shaka.test.ManifestParser = class {
   /**
    * Creates a segment reference using a relative URI.
    *
-   * @param {string} uri A relative URI to http://example.com
+   * @param {string|Array.<string>} uri A relative URI to http://example.com
    * @param {number} start
    * @param {number} end
    * @param {string=} baseUri
@@ -57,7 +57,19 @@ shaka.test.ManifestParser = class {
   static makeReference(uri, start, end, baseUri = '',
       startByte = 0, endByte = null, timestampOffset = 0,
       partialReferences = [], tilesLayout = '', syncTime = null) {
-    const getUris = () => uri.length ? [baseUri + uri] : [];
+    const getUris = () => {
+      const uris = [];
+      if (uri instanceof Array) {
+        for (const url of uri) {
+          if (url.length) {
+            uris.push(baseUri + url);
+          }
+        }
+      } else if (uri.length) {
+        uris.push(baseUri + uri);
+      }
+      return uris;
+    };
 
     // If a test wants to verify these, they can be set explicitly after
     // makeReference is called.

package/test/test/util/mss_parser_util.js

@@ -45,6 +45,8 @@ shaka.test.Mss = class {
       enableLowLatencyMode: () => {},
       updateDuration: () => {},
       newDrmInfo: (stream) => {},
+      onManifestUpdated: () => {},
+      getBandwidthEstimate: () => 1e6,
     };
     const manifest = await mssParser.start('dummy://foo', playerInterface);
     const stream = manifest.variants[0].audio;
@@ -81,6 +83,8 @@ shaka.test.Mss = class {
       enableLowLatencyMode: () => {},
       updateDuration: () => {},
       newDrmInfo: (stream) => {},
+      onManifestUpdated: () => {},
+      getBandwidthEstimate: () => 1e6,
     };
     const p = mssParser.start('dummy://foo', playerInterface);
     await expectAsync(p).toBeRejectedWith(

package/test/test/util/offline_utils.js

@@ -33,6 +33,7 @@ shaka.test.OfflineUtils = class {
     return {
       id,
       originalId: id.toString(),
+      groupId: null,
       primary: false,
       presentationTimeOffset: 0,
       type,
@@ -58,6 +59,7 @@ shaka.test.OfflineUtils = class {
       spatialAudio: false,
       closedCaptions: null,
       external: false,
+      fastSwitching: false,
     };
   }
 

package/test/test/util/simple_fakes.js

@@ -529,7 +529,7 @@ shaka.test.FakeTransmuxer = class {
         jasmine.createSpy('transmux').and.returnValue(Promise.resolve(output));
 
     /** @type {!jasmine.Spy} */
-    this.getOrginalMimeType =
-        jasmine.createSpy('getOrginalMimeType').and.returnValue('mimeType');
+    this.getOriginalMimeType =
+        jasmine.createSpy('getOriginalMimeType').and.returnValue('mimeType');
   }
 };

package/test/test/util/streaming_engine_util.js

@@ -149,13 +149,13 @@ shaka.test.StreamingEngineUtil = class {
    *   ranges for each type of init segment.
    * @param {!Object.<string,number>=} timestampOffsets The timestamp offset
    *  for each type of segment
-   * @param {shaka.extern.HlsAes128Key=} hlsAes128Key The AES-128 key to provide
+   * @param {shaka.extern.aes128Key=} aes128Key The AES-128 key to provide
    *  to streams, if desired.
    * @return {shaka.extern.Manifest}
    */
   static createManifest(
       presentationTimeline, periodStartTimes, presentationDuration,
-      segmentDurations, initSegmentRanges, timestampOffsets, hlsAes128Key) {
+      segmentDurations, initSegmentRanges, timestampOffsets, aes128Key) {
     const Util = shaka.test.Util;
 
     /**
@@ -268,9 +268,9 @@ shaka.test.StreamingEngineUtil = class {
           appendWindowStart,
           appendWindowEnd);
       const ContentType = shaka.util.ManifestParserUtils.ContentType;
-      if (hlsAes128Key &&
+      if (aes128Key &&
           (type == ContentType.AUDIO || type == ContentType.VIDEO)) {
-        ref.hlsAes128Key = hlsAes128Key;
+        ref.aes128Key = aes128Key;
       }
       return ref;
     };
@@ -394,6 +394,7 @@ shaka.test.StreamingEngineUtil = class {
     return {
       id: id,
       originalId: id.toString(),
+      groupId: null,
       createSegmentIndex: Util.spyFunc(jasmine.createSpy('createSegmentIndex')),
       segmentIndex: null,
       mimeType: 'audio/mp4',
@@ -416,6 +417,7 @@ shaka.test.StreamingEngineUtil = class {
       spatialAudio: false,
       accessibilityPurpose: null,
       external: false,
+      fastSwitching: false,
     };
   }
 
@@ -433,6 +435,7 @@ shaka.test.StreamingEngineUtil = class {
     return {
       id: id,
       originalId: id.toString(),
+      groupId: null,
       createSegmentIndex: Util.spyFunc(jasmine.createSpy('createSegmentIndex')),
       segmentIndex: null,
       mimeType: mimeType,
@@ -457,6 +460,7 @@ shaka.test.StreamingEngineUtil = class {
       spatialAudio: false,
       accessibilityPurpose: null,
       external: false,
+      fastSwitching: false,
     };
   }
 
@@ -473,6 +477,7 @@ shaka.test.StreamingEngineUtil = class {
     return {
       id: id,
       originalId: id.toString(),
+      groupId: null,
       createSegmentIndex: Util.spyFunc(jasmine.createSpy('createSegmentIndex')),
       segmentIndex: null,
       mimeType: 'text/vtt',
@@ -495,6 +500,7 @@ shaka.test.StreamingEngineUtil = class {
       spatialAudio: false,
       accessibilityPurpose: null,
       external: false,
+      fastSwitching: false,
     };
   }
 };

package/test/test/util/test_scheme.js

@@ -763,6 +763,12 @@ shaka.test.TestScheme.ManifestParser = class {
 
   /** @override */
   onExpirationUpdated() {}
+
+  /** @override */
+  onInitialVariantChosen() {}
+
+  /** @override */
+  banLocation() {}
 };
 
 

package/test/test/util/ui_utils.js

@@ -9,10 +9,11 @@ shaka.test.UiUtils = class {
    * @param {!HTMLElement} videoContainer
    * @param {!HTMLMediaElement} video
    * @param {!Object=} config
-   * @return {!shaka.ui.Overlay}
+   * @return {!Promise.<!shaka.ui.Overlay>}
    */
-  static createUIThroughAPI(videoContainer, video, config) {
-    const player = new shaka.Player(video);
+  static async createUIThroughAPI(videoContainer, video, config) {
+    const player = new shaka.Player();
+    await player.attach(video);
     // Create UI
     config = config || {};
     const ui = new shaka.ui.Overlay(player, videoContainer, video);

package/test/text/mp4_ttml_parser_unit.js

@@ -43,7 +43,7 @@ describe('Mp4TtmlParser', () => {
     parser.parseInit(ttmlInitSegment);
     const time =
         {periodStart: 0, segmentStart: 0, segmentEnd: 60, vttOffset: 0};
-    const ret = parser.parseMedia(ttmlSegmentMultipleMDAT, time);
+    const ret = parser.parseMedia(ttmlSegmentMultipleMDAT, time, null);
     // Bodies.
     expect(ret.length).toBe(2);
     // Divs.
@@ -63,10 +63,10 @@ describe('Mp4TtmlParser', () => {
     const parser = new shaka.text.Mp4TtmlParser();
     parser.parseInit(ttmlInitSegment);
 
-    const ret1 = parser.parseMedia(ttmlSegment, time1);
+    const ret1 = parser.parseMedia(ttmlSegment, time1, null);
     expect(ret1.length).toBeGreaterThan(0);
 
-    const ret2 = parser.parseMedia(ttmlSegment, time2);
+    const ret2 = parser.parseMedia(ttmlSegment, time2, null);
     expect(ret2.length).toBeGreaterThan(0);
 
     expect(ret2[0].startTime).toBe(ret1[0].startTime + 7);
@@ -164,7 +164,7 @@ describe('Mp4TtmlParser', () => {
     parser.parseInit(ttmlInitSegment);
     const time =
         {periodStart: 0, segmentStart: 0, segmentEnd: 60, vttOffset: 0};
-    const result = parser.parseMedia(ttmlSegment, time);
+    const result = parser.parseMedia(ttmlSegment, time, null);
     shaka.test.TtmlUtils.verifyHelper(
         cues, result, {startTime: 23, endTime: 53.5});
   });

package/test/text/srt_text_parser_unit.js

@@ -149,7 +149,7 @@ describe('SrtTextParser', () => {
     const data = BufferUtils.toUint8(StringUtils.toUTF8(text));
 
     const parser = new shaka.text.SrtTextParser();
-    const result = parser.parseMedia(data, time);
+    const result = parser.parseMedia(data, time, null);
 
     const expected = cues.map((cue) => {
       if (cue.nestedCues) {

package/test/text/text_displayer_layout_unit.js

@@ -37,7 +37,7 @@ filterDescribe('Cue layout', shaka.test.TextLayoutTests.supported, () => {
         // Set up UI controls.  The video element is in a paused state by
         // default, so the controls should be shown.  The video is not in the
         // DOM and is purely temporary.
-        const player = new shaka.Player(null);
+        const player = new shaka.Player();
         ui = new shaka.ui.Overlay(
             player, /** @type {!HTMLElement} */(helper.videoContainer),
             shaka.test.UiUtils.createVideoElement());