shaka-player 3.1.5 → 3.2.3

package/test/offline/manifest_convert_unit.js

@@ -101,6 +101,7 @@ describe('ManifestConverter', () => {
           audioRobustness: 'very',
           videoRobustness: 'kinda_sorta',
           serverCertificate: new Uint8Array([1, 2, 3]),
+          serverCertificateUri: '',
           sessionType: '',
           initData: [{
             initData: new Uint8Array([4, 5, 6]),
@@ -316,6 +317,7 @@ describe('ManifestConverter', () => {
       appendWindowStart: 0,
       appendWindowEnd: Infinity,
       timestampOffset: 0,
+      tilesLayout: '',
     };
 
     return segment;

package/test/offline/storage_integration.js

@@ -147,15 +147,7 @@ filterDescribe('Storage', storageSupport, () => {
     }
   });
 
-  for (const useMediaCapabilities of [true, false]) {
-    const isEnabled = useMediaCapabilities ? 'enabled' : 'disabled';
-    filterDescribe('persistent license with MediaCapabilities ' + isEnabled,
-        drmStorageSupport, () => {
-          testPersistentLicense(useMediaCapabilities);
-        });
-  }
-
-  function testPersistentLicense(useMediaCapabilities) {
+  filterDescribe('persistent license', drmStorageSupport, () => {
     /** @type {!shaka.Player} */
     let player;
     /** @type {!shaka.offline.Storage} */
@@ -166,7 +158,6 @@ filterDescribe('Storage', storageSupport, () => {
       // networking engine.  This allows us to use Player.configure in these
       // tests.
       player = new shaka.Player();
-      player.configure({'useMediaCapabilities': useMediaCapabilities});
       storage = new shaka.offline.Storage(player);
     });
 
@@ -201,7 +192,7 @@ filterDescribe('Storage', storageSupport, () => {
       expect(manifest.offlineSessionIds.length).toBeTruthy();
 
       // PART 2 - Check that the licences are stored.
-      await withDrm(player, manifest, useMediaCapabilities, (drm) => {
+      await withDrm(player, manifest, (drm) => {
         return Promise.all(manifest.offlineSessionIds.map(async (session) => {
           const foundSession = await loadOfflineSession(drm, session);
           expect(foundSession).toBeTruthy();
@@ -213,7 +204,7 @@ filterDescribe('Storage', storageSupport, () => {
       await storage.remove(uri.toString());
 
       // PART 4 - Check that the licenses were removed.
-      const p = withDrm(player, manifest, useMediaCapabilities, (drm) => {
+      const p = withDrm(player, manifest, (drm) => {
         return Promise.all(manifest.offlineSessionIds.map(async (session) => {
           const notFoundSession = await loadOfflineSession(drm, session);
           expect(notFoundSession).toBeFalsy();
@@ -257,7 +248,7 @@ filterDescribe('Storage', storageSupport, () => {
       const storedContents = await storage.list();
       expect(storedContents).toEqual([]);
 
-      await withDrm(player, manifest, useMediaCapabilities, (drm) => {
+      await withDrm(player, manifest, (drm) => {
         return Promise.all(manifest.offlineSessionIds.map(async (session) => {
           const foundSession = await loadOfflineSession(drm, session);
           expect(foundSession).toBeTruthy();
@@ -270,7 +261,7 @@ filterDescribe('Storage', storageSupport, () => {
       expect(didRemoveAll).toBe(true);
 
       // PART 6 - Check that the licenses were removed.
-      const p = withDrm(player, manifest, useMediaCapabilities, (drm) => {
+      const p = withDrm(player, manifest, (drm) => {
         return Promise.all(manifest.offlineSessionIds.map(async (session) => {
           const notFoundSession = await loadOfflineSession(drm, session);
           expect(notFoundSession).toBeFalsy();
@@ -282,7 +273,7 @@ filterDescribe('Storage', storageSupport, () => {
           shaka.util.Error.Code.OFFLINE_SESSION_REMOVED));
       await expectAsync(p).toBeRejectedWith(expected);
     });
-  }
+  });
 
   describe('default track selection callback', () => {
     const PlayerConfiguration = shaka.util.PlayerConfiguration;
@@ -1598,6 +1589,7 @@ filterDescribe('Storage', storageSupport, () => {
       keyIds: null,
       sessionType: 'temporary',
       serverCertificate: null,
+      serverCertificateUri: '',
       audioRobustness: 'HARDY',
       videoRobustness: 'OTHER',
     };
@@ -1681,11 +1673,10 @@ filterDescribe('Storage', storageSupport, () => {
   /**
    * @param {!shaka.Player} player
    * @param {shaka.extern.Manifest} manifest
-   * @param {boolean} useMediaCapabilities
    * @param {function(!shaka.media.DrmEngine):Promise} action
    * @return {!Promise}
    */
-  async function withDrm(player, manifest, useMediaCapabilities, action) {
+  async function withDrm(player, manifest, action) {
     const net = player.getNetworkingEngine();
     goog.asserts.assert(net, 'Player should have a net engine right now');
 
@@ -1703,8 +1694,7 @@ filterDescribe('Storage', storageSupport, () => {
     try {
       drm.configure(player.getConfiguration().drm);
       const variants = manifest.variants;
-      await drm.initForStorage(variants, /* usePersistentLicenses= */ true,
-          useMediaCapabilities);
+      await drm.initForStorage(variants, /* usePersistentLicenses= */ true);
       await action(drm);
     } finally {
       await drm.destroy();

package/test/player_integration.js

@@ -959,4 +959,89 @@ 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 partialUri1 = new goog.Uri('/base/test/test/assets/chapters.vtt');
+      const absoluteUri1 = locationUri.resolve(partialUri1);
+      await player.addChaptersTrack(absoluteUri1.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(10);
+      const chapter3 = chapters[2];
+      expect(chapter3.title).toBe('Chapter 3');
+      expect(chapter3.startTime).toBe(10);
+      expect(chapter3.endTime).toBe(20);
+
+      const partialUri2 = new goog.Uri('/base/test/test/assets/chapters2.vtt');
+      const absoluteUri2 = locationUri.resolve(partialUri2);
+      await player.addChaptersTrack(absoluteUri2.toString(), 'en');
+
+      await shaka.test.Util.delay(1.5);
+
+      const chaptersUpdated = player.getChapters('en');
+      expect(chaptersUpdated.length).toBe(6);
+      const chapterUpdated1 = chaptersUpdated[0];
+      expect(chapterUpdated1.title).toBe('Chapter 1');
+      expect(chapterUpdated1.startTime).toBe(0);
+      expect(chapterUpdated1.endTime).toBe(5);
+      const chapterUpdated2 = chaptersUpdated[1];
+      expect(chapterUpdated2.title).toBe('Chapter 2');
+      expect(chapterUpdated2.startTime).toBe(5);
+      expect(chapterUpdated2.endTime).toBe(10);
+      const chapterUpdated3 = chaptersUpdated[2];
+      expect(chapterUpdated3.title).toBe('Chapter 3');
+      expect(chapterUpdated3.startTime).toBe(10);
+      expect(chapterUpdated3.endTime).toBe(20);
+      const chapterUpdated4 = chaptersUpdated[3];
+      expect(chapterUpdated4.title).toBe('Chapter 4');
+      expect(chapterUpdated4.startTime).toBe(20);
+      expect(chapterUpdated4.endTime).toBe(30);
+      const chapterUpdated5 = chaptersUpdated[4];
+      expect(chapterUpdated5.title).toBe('Chapter 5');
+      expect(chapterUpdated5.startTime).toBe(30);
+      expect(chapterUpdated5.endTime).toBe(40);
+      const chapterUpdated6 = chaptersUpdated[5];
+      expect(chapterUpdated6.title).toBe('Chapter 6');
+      expect(chapterUpdated6.startTime).toBe(40);
+      expect(chapterUpdated6.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(), 'es');
+
+      await shaka.test.Util.delay(1.5);
+
+      const chapters = player.getChapters('es');
+      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,91 @@ 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 partialUri1 = new goog.Uri('/base/test/test/assets/chapters.vtt');
+    const absoluteUri1 = locationUri.resolve(partialUri1);
+    await player.addChaptersTrack(absoluteUri1.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(10);
+    const chapter3 = chapters[2];
+    expect(chapter3.title).toBe('Chapter 3');
+    expect(chapter3.startTime).toBe(10);
+    expect(chapter3.endTime).toBe(20);
+
+    const partialUri2 = new goog.Uri('/base/test/test/assets/chapters2.vtt');
+    const absoluteUri2 = locationUri.resolve(partialUri2);
+    await player.addChaptersTrack(absoluteUri2.toString(), 'en');
+
+    await shaka.test.Util.delay(1.5);
+
+    const chaptersUpdated = player.getChapters('en');
+    expect(chaptersUpdated.length).toBe(6);
+    const chapterUpdated1 = chaptersUpdated[0];
+    expect(chapterUpdated1.title).toBe('Chapter 1');
+    expect(chapterUpdated1.startTime).toBe(0);
+    expect(chapterUpdated1.endTime).toBe(5);
+    const chapterUpdated2 = chaptersUpdated[1];
+    expect(chapterUpdated2.title).toBe('Chapter 2');
+    expect(chapterUpdated2.startTime).toBe(5);
+    expect(chapterUpdated2.endTime).toBe(10);
+    const chapterUpdated3 = chaptersUpdated[2];
+    expect(chapterUpdated3.title).toBe('Chapter 3');
+    expect(chapterUpdated3.startTime).toBe(10);
+    expect(chapterUpdated3.endTime).toBe(20);
+    const chapterUpdated4 = chaptersUpdated[3];
+    expect(chapterUpdated4.title).toBe('Chapter 4');
+    expect(chapterUpdated4.startTime).toBe(20);
+    expect(chapterUpdated4.endTime).toBe(30);
+    const chapterUpdated5 = chaptersUpdated[4];
+    expect(chapterUpdated5.title).toBe('Chapter 5');
+    expect(chapterUpdated5.startTime).toBe(30);
+    expect(chapterUpdated5.endTime).toBe(40);
+    const chapterUpdated6 = chaptersUpdated[5];
+    expect(chapterUpdated6.title).toBe('Chapter 6');
+    expect(chapterUpdated6.startTime).toBe(40);
+    expect(chapterUpdated6.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(), 'es');
+
+    await shaka.test.Util.delay(1.5);
+
+    const chapters = player.getChapters('es');
+    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

@@ -1092,8 +1092,8 @@ describe('Player', () => {
         // Image tracks
         manifest.addImageStream(53, (stream) => {
           stream.originalId = 'thumbnail';
-          stream.width = 100;
-          stream.height = 200;
+          stream.width = 200;
+          stream.height = 400;
           stream.bandwidth = 10;
           stream.mimeType = 'image/jpeg';
           stream.tilesLayout = '1x1';
@@ -1503,8 +1503,8 @@ describe('Player', () => {
           audioBandwidth: null,
           videoBandwidth: null,
           bandwidth: 10,
-          width: 100,
-          height: 200,
+          width: 200,
+          height: 400,
           frameRate: null,
           pixelAspectRatio: null,
           hdr: null,
@@ -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) {
-        navigator.mediaCapabilities.decodingInfo = async (config) => {
-          await Promise.resolve();
-          const videoType = config['video'] ? config['video'].contentType : '';
-          if (videoType.includes('video') &&
+      navigator.mediaCapabilities.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) => {
@@ -3559,29 +3537,39 @@ describe('Player', () => {
 
         await player.load(fakeManifestUri, 0, fakeMimeType);
 
+        expect(player.getImageTracks()[0].width).toBe(100);
+        expect(player.getImageTracks()[0].height).toBe(50);
         const thumbnail0 = await player.getThumbnails(5, 0);
         const thumbnail1 = await player.getThumbnails(5, 11);
         const thumbnail2 = await player.getThumbnails(5, 21);
         const thumbnail5 = await player.getThumbnails(5, 51);
         expect(thumbnail0).toEqual(jasmine.objectContaining({
+          imageHeight: 150,
+          imageWidth: 200,
           positionX: 0,
           positionY: 0,
           width: 100,
           height: 50,
         }));
         expect(thumbnail1).toEqual(jasmine.objectContaining({
+          imageHeight: 150,
+          imageWidth: 200,
           positionX: 100,
           positionY: 0,
           width: 100,
           height: 50,
         }));
         expect(thumbnail2).toEqual(jasmine.objectContaining({
+          imageHeight: 150,
+          imageWidth: 200,
           positionX: 0,
           positionY: 50,
           width: 100,
           height: 50,
         }));
         expect(thumbnail5).toEqual(jasmine.objectContaining({
+          imageHeight: 150,
+          imageWidth: 200,
           positionX: 100,
           positionY: 100,
           width: 100,

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:10.000
+Chapter 2
+
+00:10.000 --> 00:20.000
+Chapter 3

package/test/test/assets/chapters2.vtt

@@ -0,0 +1,10 @@
+WEBVTT
+
+00:20.000 --> 00:30.000
+Chapter 4
+
+00:30.000 --> 00:40.000
+Chapter 5
+
+00:40.000 --> 01:01.349
+Chapter 6

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/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/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;

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/text/web_vtt_generator_unit.js

@@ -9,23 +9,45 @@ goog.require('shaka.text.WebVttGenerator');
 
 describe('WebVttGenerator', () => {
   it('supports no cues', () => {
-    verifyHelper([], 'WEBVTT\n\n');
+    verifyHelper([], [], 'WEBVTT\n\n');
   });
 
   it('convert cues to WebVTT', () => {
     const shakaCue1 = new shaka.text.Cue(20, 40, 'Test');
+    shakaCue1.textAlign = shaka.text.Cue.textAlign.LEFT;
+    shakaCue1.writingMode = shaka.text.Cue.writingMode.VERTICAL_LEFT_TO_RIGHT;
     const shakaCue2 = new shaka.text.Cue(40, 50, 'Test2');
+    shakaCue2.textAlign = shaka.text.Cue.textAlign.RIGHT;
+    shakaCue2.writingMode = shaka.text.Cue.writingMode.VERTICAL_RIGHT_TO_LEFT;
+    const shakaCue3 = new shaka.text.Cue(50, 51, 'Test3');
+    shakaCue3.textAlign = shaka.text.Cue.textAlign.CENTER;
+    const shakaCue4 = new shaka.text.Cue(52, 53, 'Test4');
+    shakaCue4.textAlign = shaka.text.Cue.textAlign.START;
+    const shakaCue5 = new shaka.text.Cue(53, 54, 'Test5');
+    shakaCue5.textAlign = shaka.text.Cue.textAlign.END;
+
+    const adCuePoints = [];
 
     verifyHelper(
         [
           shakaCue1,
           shakaCue2,
+          shakaCue3,
+          shakaCue4,
+          shakaCue5,
         ],
+        adCuePoints,
         'WEBVTT\n\n' +
-        '00:00:20.000 --> 00:00:40.000\n' +
+        '00:00:20.000 --> 00:00:40.000 align:left vertical:lr\n' +
         'Test\n\n' +
-        '00:00:40.000 --> 00:00:50.000\n' +
-        'Test2\n\n');
+        '00:00:40.000 --> 00:00:50.000 align:right vertical:rl\n' +
+        'Test2\n\n' +
+        '00:00:50.000 --> 00:00:51.000 align:middle\n' +
+        'Test3\n\n' +
+        '00:00:52.000 --> 00:00:53.000 align:start\n' +
+        'Test4\n\n' +
+        '00:00:53.000 --> 00:00:54.000 align:end\n' +
+        'Test5\n\n');
   });
 
   it('creates style tags for cues with underline/italics/bold', () => {
@@ -49,19 +71,71 @@ describe('WebVttGenerator', () => {
     nestedCue4.textDecoration.push(shaka.text.Cue.textDecoration.UNDERLINE);
 
     shakaCue.nestedCues = [nestedCue1, nestedCue2, nestedCue3, nestedCue4];
+
+    const adCuePoints = [];
+
     verifyHelper(
         [shakaCue],
+        adCuePoints,
         'WEBVTT\n\n' +
-        '00:00:10.000 --> 00:00:20.000\n' +
+        '00:00:10.000 --> 00:00:20.000 align:middle\n' +
         '<i><u>Test1</u></i><b><i>Test2</i></b>Test3<u>Test4</u>\n\n');
   });
 
+  it('computes the time with ad cue points', () => {
+    const shakaCue1 = new shaka.text.Cue(20, 30, 'Test');
+    shakaCue1.textAlign = shaka.text.Cue.textAlign.LEFT;
+    shakaCue1.writingMode = shaka.text.Cue.writingMode.VERTICAL_LEFT_TO_RIGHT;
+    const shakaCue2 = new shaka.text.Cue(40, 50, 'Test2');
+    shakaCue2.textAlign = shaka.text.Cue.textAlign.RIGHT;
+    shakaCue2.writingMode = shaka.text.Cue.writingMode.VERTICAL_RIGHT_TO_LEFT;
+    const shakaCue3 = new shaka.text.Cue(50, 51, 'Test3');
+    shakaCue3.textAlign = shaka.text.Cue.textAlign.CENTER;
+    const shakaCue4 = new shaka.text.Cue(52, 53, 'Test4');
+    shakaCue4.textAlign = shaka.text.Cue.textAlign.START;
+    const shakaCue5 = new shaka.text.Cue(53, 54, 'Test5');
+    shakaCue5.textAlign = shaka.text.Cue.textAlign.END;
+
+    const adCuePoints = [
+      {
+        start: 0,
+        end: 10,
+      },
+      {
+        start: 35,
+        end: 45,
+      },
+    ];
+
+    verifyHelper(
+        [
+          shakaCue1,
+          shakaCue2,
+          shakaCue3,
+          shakaCue4,
+          shakaCue5,
+        ],
+        adCuePoints,
+        'WEBVTT\n\n' +
+        '00:00:30.000 --> 00:00:40.000 align:left vertical:lr\n' +
+        'Test\n\n' +
+        '00:01:00.000 --> 00:01:10.000 align:right vertical:rl\n' +
+        'Test2\n\n' +
+        '00:01:10.000 --> 00:01:11.000 align:middle\n' +
+        'Test3\n\n' +
+        '00:01:12.000 --> 00:01:13.000 align:start\n' +
+        'Test4\n\n' +
+        '00:01:13.000 --> 00:01:14.000 align:end\n' +
+        'Test5\n\n');
+  });
+
   /**
    * @param {!Array} cues
+   * @param {!Array} adCuePoints
    * @param {string} text
    */
-  function verifyHelper(cues, text) {
-    const result = shaka.text.WebVttGenerator.convert(cues);
+  function verifyHelper(cues, adCuePoints, text) {
+    const result = shaka.text.WebVttGenerator.convert(cues, adCuePoints);
     expect(text).toBe(result);
   }
 });