shaka-player 3.1.4 → 3.3.0

package/test/player_integration.js

@@ -87,6 +87,41 @@ describe('Player', () => {
     });
   });  // describe('attach')
 
+  describe('updateStartTime() in manifestparsed event handler', () => {
+    it('does not get segments prior to startTime', async () => {
+      player.addEventListener('manifestparsed', () => {
+        player.updateStartTime(24);
+      });
+      const results = {
+        requestedVideoSegment0: false,
+        requestedVideoSegment1: false,
+        requestedVideoSegment2: false,
+      };
+      const expected = {
+        requestedVideoSegment0: false,
+        requestedVideoSegment1: false,
+        requestedVideoSegment2: true,
+      };
+      player.getNetworkingEngine().registerRequestFilter(
+          (type, request) => {
+            if (request.uris[0] == 'test:sintel/video/0') {
+              results.requestedVideoSegment0 = true;
+            }
+            if (request.uris[0] == 'test:sintel/video/1') {
+              results.requestedVideoSegment1 = true;
+            }
+            if (request.uris[0] == 'test:sintel/video/2') {
+              results.requestedVideoSegment2 = true;
+            }
+          });
+      await player.load('test:sintel_compiled');
+      video.play();
+      await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 25, 30);
+      expect(results).toEqual(expected);
+    });
+  });
+
+
   describe('getStats', () => {
     it('gives stats about current stream', async () => {
       // This is tested more in player_unit.js.  This is here to test the public
@@ -652,6 +687,70 @@ describe('Player', () => {
     });
   });
 
+  describe('mediaQualityChanges', () => {
+    /** @type {!jasmine.Spy} */
+    let onQualityChange;
+    /** @type {!shaka.test.Waiter} */
+    let waiter;
+
+    const qualityChange1 = jasmine.objectContaining({
+      mediaQuality: jasmine.objectContaining({
+        bandwidth: 1,
+        codecs: 'mp4a.40.2',
+        contentType: 'audio',
+        mimeType: 'audio/mp4',
+      }),
+      type: 'mediaqualitychanged',
+      position: jasmine.any(Number),
+    });
+    const qualityChange2 = jasmine.objectContaining({
+      mediaQuality: jasmine.objectContaining({
+        bandwidth: 1,
+        codecs: 'avc1.42c01e',
+        contentType: 'video',
+        mimeType: 'video/mp4',
+      }),
+      type: 'mediaqualitychanged',
+      position: jasmine.any(Number),
+    });
+
+    beforeEach(() => {
+      onQualityChange = jasmine.createSpy('onQualityChange');
+      // const spyFunc = Util.spyFunc(onQualityChange);
+      player.addEventListener('mediaqualitychanged',
+          Util.spyFunc(onQualityChange));
+      waiter = new shaka.test.Waiter(eventManager)
+          .timeoutAfter(10)
+          .failOnTimeout(true);
+    });
+
+    it('emits audio/video quality changes at start when enabled', async () => {
+      player.configure('streaming.observeQualityChanges', true);
+
+      await player.load('test:sintel_compiled');
+      video.play();
+
+      // Wait for the video to start playback.  If it takes longer than 10
+      // seconds, fail the test.
+      await waiter.waitForMovementOrFailOnTimeout(video, 10);
+      expect(onQualityChange).toHaveBeenCalledTimes(2);
+      expect(onQualityChange).toHaveBeenCalledWith(qualityChange1);
+      expect(onQualityChange).toHaveBeenCalledWith(qualityChange2);
+    });
+
+    it('does not emit quality changes at start when disabled', async () => {
+      player.configure('streaming.observeQualityChanges', false);
+
+      await player.load('test:sintel_compiled');
+      video.play();
+
+      // Wait for the video to start playback.  If it takes longer than 10
+      // seconds, fail the test.
+      await waiter.waitForMovementOrFailOnTimeout(video, 10);
+      expect(onQualityChange).not.toHaveBeenCalled();
+    });
+  });
+
   describe('seek range', () => {
     // Regression test for Issue #3675.
     it('has a reasonable seek range after going from live to VOD', async () => {
@@ -959,4 +1058,56 @@ describe('Player', () => {
       }
     });
   });  // describe('unloading')
+
+  describe('chapters', () => {
+    it('add external chapters in vtt format', async () => {
+      await player.load('test:sintel_no_text_compiled');
+      const locationUri = new goog.Uri(location.href);
+      const partialUri = new goog.Uri('/base/test/test/assets/chapters.vtt');
+      const absoluteUri = locationUri.resolve(partialUri);
+      await player.addChaptersTrack(absoluteUri.toString(), 'en');
+
+      await shaka.test.Util.delay(1.5);
+
+      const chapters = player.getChapters('en');
+      expect(chapters.length).toBe(3);
+      const chapter1 = chapters[0];
+      expect(chapter1.title).toBe('Chapter 1');
+      expect(chapter1.startTime).toBe(0);
+      expect(chapter1.endTime).toBe(5);
+      const chapter2 = chapters[1];
+      expect(chapter2.title).toBe('Chapter 2');
+      expect(chapter2.startTime).toBe(5);
+      expect(chapter2.endTime).toBe(30);
+      const chapter3 = chapters[2];
+      expect(chapter3.title).toBe('Chapter 3');
+      expect(chapter3.startTime).toBe(30);
+      expect(chapter3.endTime).toBe(61.349);
+    });
+
+    it('add external chapters in srt format', async () => {
+      await player.load('test:sintel_no_text_compiled');
+      const locationUri = new goog.Uri(location.href);
+      const partialUri = new goog.Uri('/base/test/test/assets/chapters.srt');
+      const absoluteUri = locationUri.resolve(partialUri);
+      await player.addChaptersTrack(absoluteUri.toString(), 'en');
+
+      await shaka.test.Util.delay(1.5);
+
+      const chapters = player.getChapters('en');
+      expect(chapters.length).toBe(3);
+      const chapter1 = chapters[0];
+      expect(chapter1.title).toBe('Chapter 1');
+      expect(chapter1.startTime).toBe(0);
+      expect(chapter1.endTime).toBe(5);
+      const chapter2 = chapters[1];
+      expect(chapter2.title).toBe('Chapter 2');
+      expect(chapter2.startTime).toBe(5);
+      expect(chapter2.endTime).toBe(30);
+      const chapter3 = chapters[2];
+      expect(chapter3.title).toBe('Chapter 3');
+      expect(chapter3.startTime).toBe(30);
+      expect(chapter3.endTime).toBe(61.349);
+    });
+  });  // describe('chapters')
 });

package/test/player_src_equals_integration.js

@@ -326,6 +326,58 @@ describe('Player Src Equals', () => {
     expect(newTrack).toBeTruthy();
   });
 
+  it('add external chapters in vtt format', async () => {
+    await loadWithSrcEquals(SMALL_MP4_CONTENT_URI, /* startTime= */ null);
+
+    const locationUri = new goog.Uri(location.href);
+    const partialUri = new goog.Uri('/base/test/test/assets/chapters.vtt');
+    const absoluteUri = locationUri.resolve(partialUri);
+    await player.addChaptersTrack(absoluteUri.toString(), 'en');
+
+    await shaka.test.Util.delay(1.5);
+
+    const chapters = player.getChapters('en');
+    expect(chapters.length).toBe(3);
+    const chapter1 = chapters[0];
+    expect(chapter1.title).toBe('Chapter 1');
+    expect(chapter1.startTime).toBe(0);
+    expect(chapter1.endTime).toBe(5);
+    const chapter2 = chapters[1];
+    expect(chapter2.title).toBe('Chapter 2');
+    expect(chapter2.startTime).toBe(5);
+    expect(chapter2.endTime).toBe(30);
+    const chapter3 = chapters[2];
+    expect(chapter3.title).toBe('Chapter 3');
+    expect(chapter3.startTime).toBe(30);
+    expect(chapter3.endTime).toBe(61.349);
+  });
+
+  it('add external chapters in srt format', async () => {
+    await loadWithSrcEquals(SMALL_MP4_CONTENT_URI, /* startTime= */ null);
+
+    const locationUri = new goog.Uri(location.href);
+    const partialUri = new goog.Uri('/base/test/test/assets/chapters.srt');
+    const absoluteUri = locationUri.resolve(partialUri);
+    await player.addChaptersTrack(absoluteUri.toString(), 'en');
+
+    await shaka.test.Util.delay(1.5);
+
+    const chapters = player.getChapters('en');
+    expect(chapters.length).toBe(3);
+    const chapter1 = chapters[0];
+    expect(chapter1.title).toBe('Chapter 1');
+    expect(chapter1.startTime).toBe(0);
+    expect(chapter1.endTime).toBe(5);
+    const chapter2 = chapters[1];
+    expect(chapter2.title).toBe('Chapter 2');
+    expect(chapter2.startTime).toBe(5);
+    expect(chapter2.endTime).toBe(30);
+    const chapter3 = chapters[2];
+    expect(chapter3.title).toBe('Chapter 3');
+    expect(chapter3.startTime).toBe(30);
+    expect(chapter3.endTime).toBe(61.349);
+  });
+
   // Since we are not in-charge of streaming, calling |retryStreaming| should
   // have no effect.
   it('requesting streaming retry does nothing', async () => {

package/test/player_unit.js

@@ -2809,16 +2809,7 @@ describe('Player', () => {
           expect(tracks[0].id).toBe(4);
         });
 
-
-    for (const useMediaCapabilities of [true, false]) {
-      const isEnabled = useMediaCapabilities ? 'enabled' : 'disabled';
-      it('removes if key system does not support codec with ' +
-          'MediaCapabilities ' + isEnabled, async () => {
-        await testWithUnsupportedCodec(useMediaCapabilities);
-      });
-    }
-
-    async function testWithUnsupportedCodec(useMediaCapabilities) {
+    it('removes if key system does not support codec', async () => {
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(0, (variant) => {
           variant.addVideo(1, (stream) => {
@@ -2836,35 +2827,22 @@ describe('Player', () => {
         });
       });
 
-      if (useMediaCapabilities) {
-        window.shakaMediaCapabilities.decodingInfo = async (config) => {
-          await Promise.resolve();
-          const videoType = config['video'] ? config['video'].contentType : '';
-          if (videoType.includes('video') &&
+      window.shakaMediaCapabilities.decodingInfo = async (config) => {
+        await Promise.resolve();
+        const videoType = config['video'] ? config['video'].contentType : '';
+        if (videoType.includes('video') &&
               videoType.includes('unsupported')) {
-            return {supported: false};
-          } else {
-            return {supported: true};
-          }
-        };
-      } else {
-        // We must be careful that our video/unsupported was not filtered out
-        // because of MSE support.  We are specifically testing EME-based
-        // filtering of codecs.
-        expect(MediaSource.isTypeSupported('video/unsupported')).toBe(true);
-        // Make sure that drm engine will reject the variant with an unsupported
-        // video mime type.
-        drmEngine.supportsVariant.and.callFake((variant) => {
-          return variant.video.codecs != 'unsupported';
-        });
-      }
+          return {supported: false};
+        } else {
+          return {supported: true};
+        }
+      };
 
-      player.configure({useMediaCapabilities: useMediaCapabilities});
       await player.load(fakeManifestUri, 0, fakeMimeType);
       const tracks = player.getVariantTracks();
       expect(tracks.length).toBe(1);
       expect(tracks[0].id).toBe(1);
-    }
+    });
 
     it('removes based on bandwidth', async () => {
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {

package/test/test/assets/chapters.srt

@@ -0,0 +1,11 @@
+1
+00:00,000 --> 00:05,000
+Chapter 1
+
+2
+00:05,000 --> 00:30,000
+Chapter 2
+
+3
+00:30,000 --> 01:01,349
+Chapter 3

package/test/test/assets/chapters.vtt

@@ -0,0 +1,10 @@
+WEBVTT
+
+00:00.000 --> 00:05.000
+Chapter 1
+
+00:05.000 --> 00:30.000
+Chapter 2
+
+00:30.000 --> 01:01.349
+Chapter 3

package/test/test/util/cea_utils.js

@@ -16,9 +16,9 @@ goog.require('shaka.text.Cue');
 shaka.test.CeaUtils = class {
   /**
    * Returns a cue with no underline/italics, and default colors
-   * @param {!number} startTime
-   * @param {!number} endTime
-   * @param {!string} payload
+   * @param {number} startTime
+   * @param {number} endTime
+   * @param {string} payload
    */
   static createDefaultCue(startTime, endTime, payload) {
     const cue = new shaka.text.Cue(startTime, endTime, payload);
@@ -29,13 +29,13 @@ shaka.test.CeaUtils = class {
 
   /**
    * Returns a cue with custom underline, italics, color, background color.
-   * @param {!number} startTime
-   * @param {!number} endTime
-   * @param {!string} payload
-   * @param {!boolean} underline
-   * @param {!boolean} italics
-   * @param {!string} textColor
-   * @param {!string} backgroundColor
+   * @param {number} startTime
+   * @param {number} endTime
+   * @param {string} payload
+   * @param {boolean} underline
+   * @param {boolean} italics
+   * @param {string} textColor
+   * @param {string} backgroundColor
    * @return {!shaka.text.Cue}
    */
   static createStyledCue(startTime, endTime, payload, underline,
@@ -54,8 +54,8 @@ shaka.test.CeaUtils = class {
 
   /**
    * Returns a cue that corresponds to a linebreak.
-   * @param {!number} startTime
-   * @param {!number} endTime
+   * @param {number} startTime
+   * @param {number} endTime
    * @return {!shaka.text.Cue}
    */
   static createLineBreakCue(startTime, endTime) {

package/test/test/util/dash_parser_util.js

@@ -46,6 +46,8 @@ shaka.test.Dash = class {
 
     const playerInterface = {
       networkingEngine: networkingEngine,
+      modifyManifestRequest: (request, manifestInfo) => {},
+      modifySegmentRequest: (request, segmentInfo) => {},
       filter: () => {},
       makeTextStreamsForClosedCaptions: (manifest) => {},
       onTimelineRegionAdded: fail,  // Should not have any EventStream elements.
@@ -78,6 +80,8 @@ shaka.test.Dash = class {
 
     const playerInterface = {
       networkingEngine: networkingEngine,
+      modifyManifestRequest: (request, manifestInfo) => {},
+      modifySegmentRequest: (request, segmentInfo) => {},
       filter: () => {},
       makeTextStreamsForClosedCaptions: (manifest) => {},
       onTimelineRegionAdded: fail,  // Should not have any EventStream elements.

package/test/test/util/fake_ad.js

@@ -154,6 +154,13 @@ shaka.test.FakeAd = class {
   }
 
 
+  /**
+   * @override
+   */
+  isLinear() {
+    return true;
+  }
+
   /**
    * @override
    */

package/test/test/util/fake_ad_manager.js

@@ -53,6 +53,13 @@ shaka.test.FakeAdManager = class extends shaka.util.FakeEventTarget {
   /** @override */
   replaceServerSideAdTagParameters(adTagParameters) {}
 
+  /**
+   * @override
+   */
+  getServerSideCuePoints() {
+    return [];
+  }
+
   /** @override */
   getStats() {
     return this.stats_;

package/test/test/util/fake_drm_engine.js

@@ -17,7 +17,7 @@ goog.require('shaka.test.Util');
  */
 shaka.test.FakeDrmEngine = class {
   constructor() {
-    /** @private {!Array.<number>} */
+    /** @private {!Array.<string>} */
     this.offlineSessions_ = [];
     /** @private {?shaka.extern.DrmInfo} */
     this.drmInfo_ = null;
@@ -45,6 +45,13 @@ shaka.test.FakeDrmEngine = class {
     // be returned.
     this.getDrmInfo.and.callFake(() => this.drmInfo_);
 
+    /** @type {!jasmine.Spy} */
+    this.newInitData = jasmine.createSpy('newInitData');
+    this.newInitData.and.callFake((initDataType, initData) => {
+      const num = 1 + this.offlineSessions_.length;
+      this.offlineSessions_.push('session-' + num);
+    });
+
     /** @type {!jasmine.Spy} */
     this.getExpiration = jasmine.createSpy('getExpiration');
     this.getExpiration.and.returnValue(Infinity);
@@ -90,7 +97,7 @@ shaka.test.FakeDrmEngine = class {
   }
 
   /**
-   * @param {!Array.<number>} sessions
+   * @param {!Array.<string>} sessions
    */
   setSessionIds(sessions) {
     // Copy the values to break the reference to the input value.

package/test/test/util/manifest_generator.js

@@ -407,6 +407,8 @@ shaka.test.ManifestGenerator.DrmInfo = class {
     this.keyIds = new Set();
     /** @type {string} */
     this.sessionType = '';
+    /** @type {string} */
+    this.serverCertificateUri = '';
 
     /** @type {shaka.extern.DrmInfo} */
     const foo = this;
@@ -651,15 +653,16 @@ shaka.test.ManifestGenerator.Stream = class {
    * @param {!Array.<string>} uris
    * @param {number} startByte
    * @param {?number} endByte
+   * @param {null|shaka.extern.MediaQualityInfo=} mediaQuality
    */
-  setInitSegmentReference(uris, startByte, endByte) {
+  setInitSegmentReference(uris, startByte, endByte, mediaQuality) {
     goog.asserts.assert(this.manifest_,
         'A top-level generated Manifest is required to use this method!');
 
     const getUris = () => uris;
     this.initSegmentReference_ =
         new this.manifest_.shaka_.media.InitSegmentReference(
-            getUris, startByte, endByte);
+            getUris, startByte, endByte, mediaQuality);
   }
 
   /**

package/test/test/util/manifest_parser_util.js

@@ -56,11 +56,12 @@ shaka.test.ManifestParser = class {
    * @param {?number=} endByte
    * @param {number=} timestampOffset
    * @param {!Array.<!shaka.media.SegmentReference>=} partialReferences
+   * @param {?string=} tilesLayout
    * @return {!shaka.media.SegmentReference}
    */
   static makeReference(uri, start, end, baseUri = '',
       startByte = 0, endByte = null, timestampOffset = 0,
-      partialReferences = []) {
+      partialReferences = [], tilesLayout = '') {
     const getUris = () => uri.length ? [baseUri + uri] : [];
 
     // If a test wants to verify these, they can be set explicitly after
@@ -84,6 +85,7 @@ shaka.test.ManifestParser = class {
         appendWindowStart,
         appendWindowEnd,
         partialReferences,
+        tilesLayout,
     );
   }
 };

package/test/test/util/test_scheme.js

@@ -206,10 +206,23 @@ shaka.test.TestScheme = class {
      * @param {string} name
      */
     function addStreamInfo(stream, variant, data, contentType, name) {
+      const mediaQualityInfo = {
+        bandwidth: 1,
+        codecs: data[contentType].codecs || 'unknown',
+        contentType: contentType,
+        mimeType: data[contentType].mimeType,
+        audioSamplingRate: null,
+        frameRate: null,
+        height: null,
+        channelsCount: null,
+        pixelAspectRatio: null,
+        width: null,
+      };
       stream.mimeType = data[contentType].mimeType;
       stream.codecs = data[contentType].codecs;
       stream.setInitSegmentReference(
-          ['test:' + name + '/' + contentType + '/init'], 0, null);
+          ['test:' + name + '/' + contentType + '/init'], 0, null,
+          mediaQualityInfo);
       stream.useSegmentTemplate(
           'test:' + name + '/' + contentType + '/%d',
           data[contentType].segmentDuration);

package/test/text/ttml_text_parser_unit.js

@@ -1266,6 +1266,8 @@ describe('TtmlTextParser', () => {
             fontStyle: Cue.fontStyle.ITALIC,
             lineHeight: '20px',
             fontSize: '10em',
+            textStrokeColor: 'blue',
+            textStrokeWidth: '3px',
           },
           {
             startTime: 2,
@@ -1277,6 +1279,7 @@ describe('TtmlTextParser', () => {
         '<tt xmlns:tts="http://www.w3.org/ns/ttml#styling">' +
         '<styling>' +
         '<style xml:id="s1" tts:color="red" ' +
+        'tts:textOutline="blue 3px" ' +
         'tts:backgroundColor="blue" ' +
         'tts:fontWeight="bold" ' +
         'tts:fontFamily="Times New Roman" ' +
@@ -1295,6 +1298,50 @@ describe('TtmlTextParser', () => {
         {periodStart: 0, segmentStart: 0, segmentEnd: 0});
   });
 
+  it('uses text color if tts:textOutline does not specify color', () => {
+    verifyHelper(
+        [
+          {
+            startTime: 1,
+            endTime: 2,
+            payload: 'Test',
+            color: 'red',
+            textStrokeColor: 'red',
+            textStrokeWidth: '3px',
+          },
+        ],
+        '<tt xmlns:tts="http://www.w3.org/ns/ttml#styling">' +
+        '<styling>' +
+        '<style xml:id="s1" tts:color="red" ' +
+        'tts:textOutline="3px" />' +
+        '</styling>' +
+        '<body region="subtitleArea"><div>' +
+        '<p begin="00:01.00" end="00:02.00" style="s1">Test</p>' +
+        '</div></body></tt>',
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+  });
+
+  it('does not add an outline if tts:textOutline only contains color', () => {
+    verifyHelper(
+        [
+          {
+            startTime: 1,
+            endTime: 2,
+            payload: 'Test',
+            color: 'red',
+          },
+        ],
+        '<tt xmlns:tts="http://www.w3.org/ns/ttml#styling">' +
+        '<styling>' +
+        '<style xml:id="s1" tts:color="red" ' +
+        'tts:textOutline="blue" />' +
+        '</styling>' +
+        '<body region="subtitleArea"><div>' +
+        '<p begin="00:01.00" end="00:02.00" style="s1">Test</p>' +
+        '</div></body></tt>',
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+  });
+
   // Regression test for #2623
   it('does not apply background colors to containers', () => {
     verifyHelper(