shaka-player 3.3.2 → 4.0.0

package/test/test/util/indexeddb_utils.js

@@ -4,14 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.IndexedDBUtils');
-
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
-goog.require('shaka.util.PublicPromise');
-
-
 shaka.test.IndexedDBUtils = class {
   /**
    * Make a connection to indexeddb. This assumes that it will be a new
@@ -41,8 +33,7 @@ shaka.test.IndexedDBUtils = class {
     // connection after 5 attempts (with delays in between), just give
     // up.
     let lastError;
-    for (const _ of shaka.util.Iterables.range(5)) {
-      shaka.util.Functional.ignored(_);
+    for (let i = 0; i < 5; i++) {
       try {
         return await tryOpen();  // eslint-disable-line no-await-in-loop
       } catch (e) {  // eslint-disable-line no-restricted-syntax

package/test/test/util/jasmine_fetch.js

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 // TODO: this only contains the methods that we use; if this is published
 // it should contain the entire breadth of options in jasmine-ajax.
 

package/test/test/util/loader.js

@@ -4,24 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.Loader');
-
-goog.require('shaka.log');
-goog.require('shaka.test.TestScheme');
-goog.require('shaka.util.PublicPromise');
-goog.requireType('shaka.Player');
-goog.requireType('shaka.media.InitSegmentReference');
-goog.requireType('shaka.media.PresentationTimeline');
-goog.requireType('shaka.media.SegmentIndex');
-goog.requireType('shaka.media.SegmentReference');
-goog.requireType('shaka.net.NetworkingEngine');
-goog.requireType('shaka.offline.Storage');
-goog.requireType('shaka.ui.Controls');
-goog.requireType('shaka.ui.Element');
-goog.requireType('shaka.ui.Overlay');
-goog.requireType('shaka.util.StringUtils');
-
-
 /**
  * A stand-in type for the "shaka" namespace.  Used when loading the compiled
  * library or when referencing it in ManifestGenerator or TestScheme.

package/test/test/util/manifest_generator.js

@@ -4,18 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.ManifestGenerator');
-
-goog.require('goog.asserts');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Iterables');
-goog.require('shaka.util.ManifestParserUtils');
-goog.require('shaka.util.Uint8ArrayUtils');
-goog.requireType('shaka.media.InitSegmentReference');
-goog.requireType('shaka.media.PresentationTimeline');
-goog.requireType('shaka.media.SegmentIndex');
-
-
 /**
  * @summary
  * A helper class used to generate manifests.  This is done through a series
@@ -107,6 +95,8 @@ shaka.test.ManifestGenerator.Manifest = class {
     this.offlineSessionIds = [];
     /** @type {number} */
     this.minBufferTime = 0;
+    /** @type {boolean} */
+    this.sequenceMode = false;
 
     /** @type {shaka.extern.Manifest} */
     const foo = this;
@@ -433,7 +423,7 @@ shaka.test.ManifestGenerator.DrmInfo = class {
     if (!this.initData) {
       this.initData = [];
     }
-    this.initData.push({initData: buffer, initDataType: type, keyId: null});
+    this.initData.push({initData: buffer, initDataType: type});
   }
 
   /**
@@ -606,13 +596,20 @@ shaka.test.ManifestGenerator.Stream = class {
         segmentDuration, 'Must pass a non-zero segment duration');
 
     const shaka_ = this.manifest_.shaka_;
-    const totalDuration = this.manifest_.presentationTimeline.getDuration();
+    let totalDuration = this.manifest_.presentationTimeline.getDuration();
     goog.asserts.assert(
         isFinite(totalDuration), 'Must specify a manifest duration');
+    if (!isFinite(totalDuration)) {
+      // Without this, a mistake of an infinite duration would result in an
+      // infinite loop and a crash, which would in turn prevent you from seeing
+      // the above assertion fail.
+      totalDuration = 0;
+    }
+
     const segmentCount = totalDuration / segmentDuration;
     const references = [];
 
-    for (const index of shaka.util.Iterables.range(segmentCount)) {
+    for (let index = 0; index < segmentCount; index++) {
       const getUris = () => [sprintf(template, index)];
       const start = index * segmentDuration;
       const end = Math.min(totalDuration, (index + 1) * segmentDuration);

package/test/test/util/manifest_parser_util.js

@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.ManifestParser');
-
-goog.require('shaka.media.InitSegmentReference');
-goog.require('shaka.media.SegmentReference');
-
-
 shaka.test.ManifestParser = class {
   /**
    * Verifies the segment references of a stream.
@@ -57,11 +51,12 @@ shaka.test.ManifestParser = class {
    * @param {number=} timestampOffset
    * @param {!Array.<!shaka.media.SegmentReference>=} partialReferences
    * @param {?string=} tilesLayout
+   * @param {?number=} syncTime
    * @return {!shaka.media.SegmentReference}
    */
   static makeReference(uri, start, end, baseUri = '',
       startByte = 0, endByte = null, timestampOffset = 0,
-      partialReferences = [], tilesLayout = '') {
+      partialReferences = [], tilesLayout = '', syncTime = null) {
     const getUris = () => uri.length ? [baseUri + uri] : [];
 
     // If a test wants to verify these, they can be set explicitly after
@@ -86,6 +81,8 @@ shaka.test.ManifestParser = class {
         appendWindowEnd,
         partialReferences,
         tilesLayout,
+        /* tileDuration= */ undefined,
+        syncTime,
     );
   }
 };

package/test/test/util/offline_utils.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.OfflineUtils');
-
-goog.require('shaka.util.BufferUtils');
-
-
 shaka.test.OfflineUtils = class {
   /**
    * @param {string} originalUri
@@ -25,6 +20,7 @@ shaka.test.OfflineUtils = class {
       streams: [],
       sessionIds: [],
       size: 1024,
+      sequenceMode: false,
     };
   }
 

package/test/test/util/simple_fakes.js

@@ -4,28 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.FakeAbrManager');
-goog.provide('shaka.test.FakeClosedCaptionParser');
-goog.provide('shaka.test.FakeManifestParser');
-goog.provide('shaka.test.FakePlayhead');
-goog.provide('shaka.test.FakePlayheadObserver');
-goog.provide('shaka.test.FakePresentationTimeline');
-goog.provide('shaka.test.FakeSegmentIndex');
-goog.provide('shaka.test.FakeStreamingEngine');
-goog.provide('shaka.test.FakeTextTrack');
-goog.provide('shaka.test.FakeTransmuxer');
-goog.provide('shaka.test.FakeVideo');
-
-goog.require('shaka.test.Util');
-goog.require('shaka.abr.SimpleAbrManager');
-goog.require('shaka.media.IClosedCaptionParser');
-goog.require('shaka.media.Playhead');
-goog.require('shaka.media.PresentationTimeline');
-goog.require('shaka.media.SegmentIndex');
-goog.require('shaka.media.StreamingEngine');
-goog.require('shaka.media.Transmuxer');
-
-
 /**
  * @fileoverview Defines simple mocks for library types.
  * @suppress {checkTypes} Suppress errors about missmatches between the
@@ -351,19 +329,24 @@ shaka.test.FakePlayhead = class {
 /** @extends {TextTrack} */
 shaka.test.FakeTextTrack = class {
   constructor() {
+    // The compiler knows TextTrack.cues is const, and we lied and said we
+    // "extend" TextTrack, so it won't let us assign to cues here.  But we
+    // must, because this fake is a from-scratch implementation of the API.
+    // This cast-hack works around the issue.
     /** @type {!Array.<TextTrackCue>} */
-    this.cues = [];
+    const cues = [];
+    (/** @type {?} */(this))['cues'] = cues;
 
     /** @type {!jasmine.Spy} */
     this.addCue = jasmine.createSpy('addCue').and.callFake((cue) => {
-      this.cues.push(cue);
+      cues.push(cue);
     });
 
     /** @type {!jasmine.Spy} */
     this.removeCue = jasmine.createSpy('removeCue').and.callFake((cue) => {
-      const idx = this.cues.indexOf(cue);
+      const idx = cues.indexOf(cue);
       expect(idx).not.toBeLessThan(0);
-      this.cues.splice(idx, 1);
+      cues.splice(idx, 1);
     });
   }
 };

package/test/test/util/stream_generator.js

@@ -4,20 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.IStreamGenerator');
-goog.provide('shaka.test.Mp4LiveStreamGenerator');
-goog.provide('shaka.test.Mp4VodStreamGenerator');
-goog.provide('shaka.test.StreamGenerator');
-goog.provide('shaka.test.TSVodStreamGenerator');
-
-goog.require('goog.asserts');
-goog.require('shaka.log');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.DataViewReader');
-goog.require('shaka.util.Uint8ArrayUtils');
-
-
 /**
  * @summary
  * Defines an interface to generate streams.

package/test/test/util/streaming_engine_util.js

@@ -4,21 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.StreamingEngineUtil');
-
-goog.require('goog.asserts');
-goog.require('shaka.media.InitSegmentReference');
-goog.require('shaka.media.SegmentReference');
-goog.require('shaka.test.FakeNetworkingEngine');
-goog.require('shaka.test.FakePresentationTimeline');
-goog.require('shaka.test.FakeSegmentIndex');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.AbortableOperation');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.ManifestParserUtils');
-goog.requireType('shaka.media.PresentationTimeline');
-
-
 shaka.test.StreamingEngineUtil = class {
   /**
    * Creates a FakeNetworkingEngine.
@@ -290,6 +275,7 @@ shaka.test.StreamingEngineUtil = class {
       variants: [],
       textStreams: [],
       imageStreams: [],
+      sequenceMode: false,
     };
 
     /** @type {shaka.extern.Variant} */

package/test/test/util/test_scheme.js

@@ -4,24 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.TestScheme');
-
-goog.require('goog.asserts');
-goog.require('goog.Uri');
-goog.require('shaka.Player');
-goog.require('shaka.media.ManifestParser');
-goog.require('shaka.net.NetworkingEngine');
-goog.require('shaka.test.ManifestGenerator');
-goog.require('shaka.test.Mp4VodStreamGenerator');
-goog.require('shaka.test.TSVodStreamGenerator');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.AbortableOperation');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.ManifestParserUtils');
-goog.requireType('shaka.net.NetworkingEngine.RequestType');
-goog.requireType('shaka.test.IStreamGenerator');
-
-
 /**
  * @typedef {{
  *   initSegmentUri: string,
@@ -69,7 +51,8 @@ let ExtraMetadataType;
  *   textLanguages: (!Array.<string>|undefined),
  *   duration: number,
  *   licenseServers: (!Object.<string, string>|undefined),
- *   licenseRequestHeaders: (!Object.<string, string>|undefined)
+ *   licenseRequestHeaders: (!Object.<string, string>|undefined),
+ *   sequenceMode: boolean
  * }}
  */
 let MetadataType;
@@ -296,6 +279,7 @@ shaka.test.TestScheme = class {
 
       const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.presentationTimeline.setDuration(data.duration);
+        manifest.sequenceMode = data.sequenceMode;
 
         const videoResolutions = data.videoResolutions || [undefined];
         const audioLanguages = data.audioLanguages ||
@@ -529,6 +513,16 @@ shaka.test.TestScheme.DATA = {
     audio: sintelAudioSegment,
     text: vttSegment,
     duration: 30,
+    sequenceMode: false,
+  },
+
+  // Like 'sintel', but flagged as sequence mode.
+  'sintel_sequence': {
+    video: sintelVideoSegment,
+    audio: sintelAudioSegment,
+    text: vttSegment,
+    duration: 30,
+    sequenceMode: true,
   },
 
   // Like 'sintel', but much longer to test buffering and seeking.
@@ -536,6 +530,7 @@ shaka.test.TestScheme.DATA = {
     video: sintelVideoSegment,
     audio: sintelAudioSegment,
     duration: 300,
+    sequenceMode: false,
   },
 
   // Like 'sintel' above, but with languages and delayed setup.
@@ -552,6 +547,7 @@ shaka.test.TestScheme.DATA = {
       language: 'fa',  // Necessary to repro #1696
     }),
     duration: 30,
+    sequenceMode: false,
   },
 
   'sintel_multi_lingual_multi_res': {
@@ -565,25 +561,29 @@ shaka.test.TestScheme.DATA = {
     audioLanguages: ['en', 'es'],
     textLanguages: ['zh', 'fr'],
     duration: 30,
+    sequenceMode: false,
   },
 
   'sintel_audio_only': {
     audio: sintelAudioSegment,
     duration: 30,
+    sequenceMode: false,
   },
 
   'sintel_no_text': {
     video: sintelVideoSegment,
     audio: sintelAudioSegment,
     duration: 30,
+    sequenceMode: false,
   },
 
-  // https://github.com/google/shaka-player/issues/2553
+  // https://github.com/shaka-project/shaka-player/issues/2553
   'forced_subs_simulation': {
     audio: sintelAudioSegment,
     text: vttSegment,
     textLanguages: ['de', 'de'],  // one of these is the "forced subs" track
     duration: 30,
+    sequenceMode: false,
   },
 
   'sintel-enc': {
@@ -592,6 +592,7 @@ shaka.test.TestScheme.DATA = {
     text: vttSegment,
     licenseServers: widevineDrmServers,
     duration: 30,
+    sequenceMode: false,
   },
 
   'multidrm': {
@@ -601,6 +602,7 @@ shaka.test.TestScheme.DATA = {
     licenseServers: axinomDrmServers,
     licenseRequestHeaders: axinomDrmHeaders,
     duration: 30,
+    sequenceMode: false,
   },
 
   'multidrm_no_init_data': {
@@ -613,6 +615,7 @@ shaka.test.TestScheme.DATA = {
     licenseServers: axinomDrmServers,
     licenseRequestHeaders: axinomDrmHeaders,
     duration: 30,
+    sequenceMode: false,
   },
 
   'cea-708_ts': {
@@ -626,6 +629,7 @@ shaka.test.TestScheme.DATA = {
       mimeType: 'application/cea-608',
     },
     duration: 30,
+    sequenceMode: false,
   },
 
   'cea-708_mp4': {
@@ -640,6 +644,7 @@ shaka.test.TestScheme.DATA = {
       closedCaptions: new Map([['CC1', 'en']]),
     },
     duration: 30,
+    sequenceMode: false,
   },
 };
 

package/test/test/util/ttml_utils.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.TtmlUtils');
-
 shaka.test.TtmlUtils = class {
   /**
    * @param {!Array} expectedCues

package/test/test/util/ui_utils.js

@@ -4,15 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
-goog.provide('shaka.test.UiUtils');
-
-goog.require('shaka.Player');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.ui.Overlay');
-goog.require('shaka.util.EventManager');
-
-
 shaka.test.UiUtils = class {
   /**
    * @param {!HTMLElement} videoContainer

package/test/test/util/util.js

@@ -4,19 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.StatusPromise');
-goog.provide('shaka.test.Util');
-
-goog.require('goog.asserts');
-goog.require('shaka.media.InitSegmentReference');
-goog.require('shaka.media.SegmentReference');
-goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
-goog.require('shaka.util.StringUtils');
-goog.require('shaka.util.XmlUtils');
-goog.requireType('shaka.util.Error');
-
-
 /**
  * @extends {Promise}
  */
@@ -52,10 +39,9 @@ shaka.test.Util = class {
    */
   static async fakeEventLoop(duration, onTick) {
     // Run this synchronously:
-    for (const time of shaka.util.Iterables.range(duration)) {
+    for (let time = 0; time < duration; time++) {
       // We shouldn't need more than 6 rounds.
-      for (const _ of shaka.util.Iterables.range(6)) {
-        shaka.util.Functional.ignored(_);
+      for (let i = 0; i < 6; i++) {
         jasmine.clock().tick(0);
         await Promise.resolve();  // eslint-disable-line no-await-in-loop
       }
@@ -203,7 +189,7 @@ shaka.test.Util = class {
       if (actual.childNodes.length != expected.childNodes.length) {
         return prospectiveDiff + 'Different child node list length.';
       }
-      for (const i of shaka.util.Iterables.range(actual.childNodes.length)) {
+      for (let i = 0; i < actual.childNodes.length; i++) {
         const aNode = actual.childNodes[i];
         const eNode = expected.childNodes[i];
         const diff =
@@ -334,9 +320,9 @@ shaka.test.Util = class {
     // TODO: There should be a way to alter the externs for jasmine.Spy so that
     // this utility is not needed.
     // Why isn't there something like ICallable in Closure?
-    // https://github.com/google/closure-compiler/issues/946
+    // https://github.com/shaka-project/closure-compiler/issues/946
     // Why isn't it enough that jasmine.Spy extends Function?
-    // https://github.com/google/closure-compiler/issues/1422
+    // https://github.com/shaka-project/closure-compiler/issues/1422
     return /** @type {Function} */(spy)(...varArgs);
   }
 
@@ -467,13 +453,13 @@ shaka.test.Util = class {
  */
 shaka.test.Util.customMatchers_ = {
   // Custom matcher for Element objects.
-  toEqualElement: (util, customEqualityTesters) => {
+  toEqualElement: (util) => {
     return {
       compare: shaka.test.Util.expectToEqualElementCompare_,
     };
   },
   // Custom matcher for working with spies.
-  toHaveBeenCalledOnceMore: (util, customEqualityTesters) => {
+  toHaveBeenCalledOnceMore: (util) => {
     return {
       compare: (actual, expected) => {
         const callCount = actual.calls.count();
@@ -493,7 +479,7 @@ shaka.test.Util.customMatchers_ = {
       },
     };
   },
-  toHaveBeenCalledOnceMoreWith: (util, customEqualityTesters) => {
+  toHaveBeenCalledOnceMoreWith: (util) => {
     return {
       compare: (actual, expected) => {
         const callCount = actual.calls.count();
@@ -506,7 +492,7 @@ shaka.test.Util.customMatchers_ = {
         if (callCount != 1) {
           result.pass = false;
           result.message = 'Expected to be called once, not ' + callCount;
-        } else if (!util.equals(callArgs, expected, customEqualityTesters)) {
+        } else if (!util.equals(callArgs, expected)) {
           result.pass = false;
           result.message =
               'Expected to be called with ' + expected + ' not ' + callArgs;