shaka-player 4.2.4 → 4.2.6

package/lib/text/ttml_text_parser.js

@@ -136,7 +136,7 @@ shaka.text.TtmlTextParser = class {
     }
 
     const cue = TtmlTextParser.parseCue_(
-        body, time.periodStart, rateInfo, metadataElements, styles,
+        body, time, rateInfo, metadataElements, styles,
         regionElements, cueRegions, whitespaceTrim,
         cellResolutionInfo, /* parentCueElement= */ null,
         /* isContent= */ false);
@@ -157,7 +157,7 @@ shaka.text.TtmlTextParser = class {
    * Parses a TTML node into a Cue.
    *
    * @param {!Node} cueNode
-   * @param {number} offset
+   * @param {shaka.extern.TextParser.TimeContext} timeContext
    * @param {!shaka.text.TtmlTextParser.RateInfo_} rateInfo
    * @param {!Array.<!Element>} metadataElements
    * @param {!Array.<!Element>} styles
@@ -171,7 +171,7 @@ shaka.text.TtmlTextParser = class {
    * @private
    */
   static parseCue_(
-      cueNode, offset, rateInfo, metadataElements, styles, regionElements,
+      cueNode, timeContext, rateInfo, metadataElements, styles, regionElements,
       cueRegions, whitespaceTrim, cellResolution, parentCueElement, isContent) {
     /** @type {Element} */
     let cueElement;
@@ -236,7 +236,7 @@ shaka.text.TtmlTextParser = class {
       for (const childNode of cueElement.childNodes) {
         const nestedCue = shaka.text.TtmlTextParser.parseCue_(
             childNode,
-            offset,
+            timeContext,
             rateInfo,
             metadataElements,
             styles,
@@ -293,15 +293,20 @@ shaka.text.TtmlTextParser = class {
     if (start == null) {
       start = 0;
     }
-    start += offset;
+    start += timeContext.periodStart;
 
     // If end is null, that means the duration is effectively infinite.
     if (end == null) {
       end = Infinity;
     } else {
-      end += offset;
+      end += timeContext.periodStart;
     }
 
+    // Clip times to segment boundaries.
+    // https://github.com/shaka-project/shaka-player/issues/4631
+    start = Math.max(start, timeContext.segmentStart);
+    end = Math.min(end, timeContext.segmentEnd);
+
     if (!hasTimeAttributes && nestedCues.length > 0) {
       // If no time is defined for this cue, base the timing information on
       // the time of the nested cues. In the case of multiple nested cues with
@@ -569,8 +574,28 @@ shaka.text.TtmlTextParser = class {
 
     const fontFamily = TtmlTextParser.getStyleAttribute_(
         cueElement, region, styles, 'fontFamily', shouldInheritRegionStyles);
+    // See https://github.com/sandflow/imscJS/blob/1.1.3/src/main/js/html.js#L1384
     if (fontFamily) {
-      cue.fontFamily = fontFamily;
+      switch (fontFamily) {
+        case 'monospaceSerif':
+          cue.fontFamily = 'Courier New,Liberation Mono,Courier,monospace';
+          break;
+        case 'proportionalSansSerif':
+          cue.fontFamily = 'Arial,Helvetica,Liberation Sans,sans-serif';
+          break;
+        case 'sansSerif':
+          cue.fontFamily = 'sans-serif';
+          break;
+        case 'monospaceSansSerif':
+          cue.fontFamily = 'Consolas,monospace';
+          break;
+        case 'proportionalSerif':
+          cue.fontFamily = 'serif';
+          break;
+        default:
+          cue.fontFamily = fontFamily;
+          break;
+      }
     }
 
     const fontWeight = TtmlTextParser.getStyleAttribute_(

package/lib/text/ui_text_displayer.js

@@ -199,6 +199,19 @@ shaka.text.UITextDisplayer = class {
     this.isTextVisible_ = on;
   }
 
+  /**
+   * @private
+   */
+  isElementUnderTextContainer_(elemToCheck) {
+    while (elemToCheck != null) {
+      if (elemToCheck == this.textContainer_) {
+        return true;
+      }
+      elemToCheck = elemToCheck.parentElement;
+    }
+    return false;
+  }
+
   /**
    * @param {!Array.<!shaka.extern.Cue>} cues
    * @param {!HTMLElement} container
@@ -260,6 +273,9 @@ shaka.text.UITextDisplayer = class {
           cueRegistry = this.currentCuesMap_.get(cue);
           wrapper = cueRegistry.wrapper;
           updateDOM = true;
+        } else if (!this.isElementUnderTextContainer_(wrapper)) {
+          // We found that the wrapper needs to be in the DOM
+          updateDOM = true;
         }
       }
 
@@ -276,6 +292,7 @@ shaka.text.UITextDisplayer = class {
       const topCue = parents.pop();
       goog.asserts.assert(topCue == cue, 'Parent cues should be kept in order');
     }
+
     if (updateDOM) {
       for (const element of toUproot) {
         // NOTE: Because we uproot shared region elements, too, we might hit an
@@ -578,7 +595,7 @@ shaka.text.UITextDisplayer = class {
     //   (for vertical growing left) is aligned at the line.
     // TODO: Implement line alignment with line number.
     // TODO: Implement lineAlignment of 'CENTER'.
-    if (cue.line) {
+    if (cue.line != null) {
       if (cue.lineInterpretation == Cue.lineInterpretation.PERCENTAGE) {
         // When setting absolute positioning, you need to set x/y/width/height
         // so the element is positioned correctly.  Set these as default and
@@ -591,21 +608,21 @@ shaka.text.UITextDisplayer = class {
           if (cue.lineAlign == Cue.lineAlign.START) {
             style.top = cue.line + '%';
           } else if (cue.lineAlign == Cue.lineAlign.END) {
-            style.bottom = cue.line + '%';
+            style.bottom = (100 - cue.line) + '%';
           }
         } else if (cue.writingMode == Cue.writingMode.VERTICAL_LEFT_TO_RIGHT) {
           style.height = '100%';
           if (cue.lineAlign == Cue.lineAlign.START) {
             style.left = cue.line + '%';
           } else if (cue.lineAlign == Cue.lineAlign.END) {
-            style.right = cue.line + '%';
+            style.right = (100 - cue.line) + '%';
           }
         } else {
           style.height = '100%';
           if (cue.lineAlign == Cue.lineAlign.START) {
             style.right = cue.line + '%';
           } else if (cue.lineAlign == Cue.lineAlign.END) {
-            style.left = cue.line + '%';
+            style.left = (100 - cue.line) + '%';
           }
         }
       }
@@ -615,7 +632,7 @@ shaka.text.UITextDisplayer = class {
 
     // The position defines the indent of the text container in the
     // direction defined by the writing direction.
-    if (cue.position) {
+    if (cue.position != null) {
       if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
         style.paddingLeft = cue.position;
       } else {

package/lib/util/platform.js

@@ -174,7 +174,7 @@ shaka.util.Platform = class {
    * @return {?number} A major version number or null if not Chromium-based.
    */
   static chromeVersion() {
-    if (!shaka.util.Platform.userAgentContains_('Chrome')) {
+    if (!shaka.util.Platform.isChrome()) {
       return null;
     }
 
@@ -213,6 +213,7 @@ shaka.util.Platform = class {
     return !!navigator.vendor && navigator.vendor.includes('Apple') &&
         !shaka.util.Platform.isTizen() &&
         !shaka.util.Platform.isEOS() &&
+        !shaka.util.Platform.isVirginMedia() &&
         !shaka.util.Platform.isPS4() &&
         !shaka.util.Platform.isAmazonFireTV();
   }
@@ -237,6 +238,13 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('PlayStation 4');
   }
 
+  /**
+   * Check if the current platform is Virgin Media device.
+   */
+  static isVirginMedia() {
+    return shaka.util.Platform.userAgentContains_('VirginMedia');
+  }
+
   /**
    * Check if the current platform is Amazon Fire TV.
    * https://developer.amazon.com/docs/fire-tv/identify-amazon-fire-tv-devices.html

package/lib/util/player_configuration.js

@@ -11,6 +11,7 @@ goog.require('shaka.abr.SimpleAbrManager');
 goog.require('shaka.log');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.ConfigUtils');
+goog.require('shaka.util.FairPlayUtils');
 goog.require('shaka.util.LanguageUtils');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.Platform');
@@ -67,9 +68,15 @@ shaka.util.PlayerConfiguration = class {
       advanced: {},    // key is arbitrary key system ID, value is a record type
       delayLicenseRequestUntilPlayed: false,
       initDataTransform: (initData, initDataType, drmInfo) => {
-        return shaka.util.ConfigUtils.referenceParametersAndReturn(
-            [initData, initDataType, drmInfo],
-            initData);
+        const keySystem = drmInfo.keySystem;
+        if (keySystem == 'com.apple.fps.1_0' && initDataType == 'skd') {
+          const cert = drmInfo.serverCertificate;
+          const contentId =
+              shaka.util.FairPlayUtils.defaultGetContentId(initData);
+          initData = shaka.util.FairPlayUtils.initDataTransform(
+              initData, contentId, cert);
+        }
+        return initData;
       },
       logLicenseExchange: false,
       updateExpirationTime: 1,

package/lib/util/stream_utils.js

@@ -438,15 +438,20 @@ shaka.util.StreamUtils = class {
       const video = variant.video;
       const ContentType = shaka.util.ManifestParserUtils.ContentType;
       if (video) {
-        let videoCodecs = shaka.util.StreamUtils.patchVp9(video.codecs);
+        let videoCodecs =
+            shaka.util.StreamUtils.getCorrectVideoCodecs_(video.codecs);
         // For multiplexed streams. Here we must check the audio of the
         // stream to see if it is compatible.
         if (video.codecs.includes(',')) {
           const allCodecs = video.codecs.split(',');
           videoCodecs = shaka.util.ManifestParserUtils.guessCodecs(
               ContentType.VIDEO, allCodecs);
-          const audioCodecs = shaka.util.ManifestParserUtils.guessCodecs(
+          videoCodecs =
+              shaka.util.StreamUtils.getCorrectVideoCodecs_(videoCodecs);
+          let audioCodecs = shaka.util.ManifestParserUtils.guessCodecs(
               ContentType.AUDIO, allCodecs);
+          audioCodecs =
+              shaka.util.StreamUtils.getCorrectAudioCodecs_(audioCodecs);
           const audioFullType = shaka.util.MimeUtils.getFullOrConvertedType(
               video.mimeType, audioCodecs, ContentType.AUDIO);
           if (!MediaSource.isTypeSupported(audioFullType)) {
@@ -566,7 +571,8 @@ shaka.util.StreamUtils = class {
         const allCodecs = video.codecs.split(',');
         videoCodecs = shaka.util.ManifestParserUtils.guessCodecs(
             ContentType.VIDEO, allCodecs);
-        videoCodecs = shaka.util.StreamUtils.patchVp9(videoCodecs);
+        videoCodecs =
+            shaka.util.StreamUtils.getCorrectVideoCodecs_(videoCodecs);
         const audioCodecs = shaka.util.ManifestParserUtils.guessCodecs(
             ContentType.AUDIO, allCodecs);
 
@@ -580,7 +586,7 @@ shaka.util.StreamUtils = class {
           spatialRendering: false,
         };
       }
-      videoCodecs = shaka.util.StreamUtils.patchVp9(videoCodecs);
+      videoCodecs = shaka.util.StreamUtils.getCorrectVideoCodecs_(videoCodecs);
       const fullType = shaka.util.MimeUtils.getFullOrConvertedType(
           video.mimeType, videoCodecs, ContentType.VIDEO);
       // VideoConfiguration
@@ -749,15 +755,29 @@ shaka.util.StreamUtils = class {
 
 
   /**
-   * MediaCapabilities supports 'vp09...' codecs, but not 'vp9'. Translate vp9
-   * codec strings into 'vp09...', to allow such content to play with
-   * mediaCapabilities enabled.
-   *
+   * Generates the correct video codec for MediaDecodingConfiguration and
+   * for MediaSource.isTypeSupported.
    * @param {string} codec
    * @return {string}
+   * @private
    */
-  static patchVp9(codec) {
-    if (codec == 'vp9') {
+  static getCorrectVideoCodecs_(codec) {
+    if (codec.includes('avc1')) {
+      // Convert avc1 codec string from RFC-4281 to RFC-6381 for
+      // MediaSource.isTypeSupported
+      // Example, convert avc1.66.30 to avc1.42001e (0x42 == 66 and 0x1e == 30)
+      const avcdata = codec.split('.');
+      if (avcdata.length == 3) {
+        let result = avcdata.shift() + '.';
+        result += parseInt(avcdata.shift(), 10).toString(16);
+        result +=
+            ('000' + parseInt(avcdata.shift(), 10).toString(16)).slice(-4);
+        return result;
+      }
+    } else if (codec == 'vp9') {
+      // MediaCapabilities supports 'vp09...' codecs, but not 'vp9'. Translate
+      // vp9 codec strings into 'vp09...', to allow such content to play with
+      // mediaCapabilities enabled.
       // This means profile 0, level 4.1, 8-bit color.  This supports 1080p @
       // 60Hz.  See https://en.wikipedia.org/wiki/VP9#Levels
       //

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.2.4",
+  "version": "4.2.6",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [

package/shaka-player.uncompiled.js

@@ -32,6 +32,7 @@ goog.require('shaka.offline.OfflineManifestParser');
 goog.require('shaka.offline.OfflineScheme');
 goog.require('shaka.offline.Storage');
 goog.require('shaka.offline.indexeddb.StorageMechanism');
+goog.require('shaka.polyfill.AbortController');
 goog.require('shaka.polyfill.Aria');
 goog.require('shaka.polyfill.EncryptionScheme');
 goog.require('shaka.polyfill.Fullscreen');

package/test/dash/dash_parser_manifest_unit.js

@@ -2106,6 +2106,7 @@ describe('DashParser Manifest', () => {
     /** @type {shaka.extern.Manifest} */
     const manifest = await parser.start('dummy://foo', playerInterface);
     expect(manifest.imageStreams.length).toBe(1);
+    expect(manifest.presentationTimeline.getMaxSegmentDuration()).toBe(1);
     const imageStream = manifest.imageStreams[0];
     expect(imageStream.width).toBe(1024);
     expect(imageStream.height).toBe(1152);

package/test/hls/hls_parser_unit.js

@@ -38,6 +38,7 @@ describe('HlsParser', () => {
 
   afterEach(() => {
     shaka.log.alwaysWarn = originalAlwaysWarn;
+    parser.stop();
   });
 
   beforeEach(() => {

package/test/media/drm_engine_unit.js

@@ -120,11 +120,17 @@ describe('DrmEngine', () => {
     };
 
     drmEngine = new shaka.media.DrmEngine(playerInterface);
+
     config = shaka.util.PlayerConfiguration.createDefault().drm;
     config.servers = {
       'drm.abc': 'http://abc.drm/license',
       'drm.def': 'http://def.drm/license',
     };
+    // Some platforms, such as Xbox, default to parseInbandPssh: true, which
+    // ignores encrypted events.  So set it explicitly to false, and let
+    // individual tests set it to true where relevant.
+    config.parseInbandPsshEnabled = false;
+
     drmEngine.configure(config);
   });
 
@@ -2548,7 +2554,11 @@ describe('DrmEngine', () => {
    */
   async function sendEncryptedEvent(
       initDataType = 'cenc', initData = new Uint8Array(1), keyId = null) {
-    mockVideo.on['encrypted']({initDataType, initData, keyId});
+    // For some platforms, such as Xbox, where parseInbandPssh defaults to
+    // true, this listener may never be set.
+    if (mockVideo.on['encrypted']) {
+      mockVideo.on['encrypted']({initDataType, initData, keyId});
+    }
 
     await Util.shortDelay();
   }

package/test/media/media_source_engine_integration.js

@@ -6,6 +6,8 @@
 
 describe('MediaSourceEngine', () => {
   const ContentType = shaka.util.ManifestParserUtils.ContentType;
+  const Cue = shaka.text.Cue;
+  const Util = shaka.test.Util;
   const presentationDuration = 840;
 
   /** @type {!HTMLVideoElement} */
@@ -18,6 +20,64 @@ describe('MediaSourceEngine', () => {
   let metadata;
   // TODO: add text streams to MSE integration tests
 
+  const mp4CeaCue0 = jasmine.objectContaining({
+    startTime: Util.closeTo(0.067, 0.001),
+    endTime: Util.closeTo(1, 0.001),
+    textAlign: Cue.textAlign.CENTER,
+    nestedCues: [
+      jasmine.objectContaining({
+        startTime: Util.closeTo(0.067, 0.001),
+        endTime: Util.closeTo(1, 0.001),
+        payload: 'eng:⠀00:00:00:00',
+        textAlign: Cue.textAlign.CENTER,
+      }),
+    ],
+  });
+
+  const tsCeaCue0 = jasmine.objectContaining({
+    startTime: Util.closeTo(0.767, 0.001),
+    endTime: Util.closeTo(4.972, 0.001),
+    textAlign: Cue.textAlign.CENTER,
+    payload: 'These are 608 captions\n(top left)',
+  });
+
+  const tsCeaCue1 = jasmine.objectContaining({
+    startTime: Util.closeTo(5.305, 0.001),
+    endTime: Util.closeTo(11.979, 0.001),
+    textAlign: Cue.textAlign.CENTER,
+    payload: 'These are 608 captions\n(middle)',
+  });
+
+  const tsCeaCue2 = jasmine.objectContaining({
+    startTime: Util.closeTo(12.312, 0.001),
+    endTime: Util.closeTo(19.319, 0.001),
+    textAlign: Cue.textAlign.CENTER,
+    payload: 'These are 608 captions\n(bottom left)',
+  });
+
+  // The same segments as above, but offset by 40 seconds (yes, 40), which is
+  // also 2 segments.
+  const tsCeaCue3 = jasmine.objectContaining({
+    startTime: Util.closeTo(40.767, 0.001),
+    endTime: Util.closeTo(44.972, 0.001),
+    textAlign: Cue.textAlign.CENTER,
+    payload: 'These are 608 captions\n(top left)',
+  });
+
+  const tsCeaCue4 = jasmine.objectContaining({
+    startTime: Util.closeTo(45.305, 0.001),
+    endTime: Util.closeTo(51.979, 0.001),
+    textAlign: Cue.textAlign.CENTER,
+    payload: 'These are 608 captions\n(middle)',
+  });
+
+  const tsCeaCue5 = jasmine.objectContaining({
+    startTime: Util.closeTo(52.312, 0.001),
+    endTime: Util.closeTo(59.319, 0.001),
+    textAlign: Cue.textAlign.CENTER,
+    payload: 'These are 608 captions\n(bottom left)',
+  });
+
   /**
    * We use a fake text displayer so that we can check if CEA text is being
    * passed through the system correctly.
@@ -387,9 +447,14 @@ describe('MediaSourceEngine', () => {
     // platforms with native TS support.
     await mediaSourceEngine.init(initObject, /* forceTransmuxTS= */ true);
     mediaSourceEngine.setSelectedClosedCaptionId('CC1');
+
     await append(ContentType.VIDEO, 0);
 
     expect(textDisplayer.appendSpy).toHaveBeenCalledTimes(3);
+
+    expect(textDisplayer.appendSpy).toHaveBeenCalledWith([tsCeaCue0]);
+    expect(textDisplayer.appendSpy).toHaveBeenCalledWith([tsCeaCue1]);
+    expect(textDisplayer.appendSpy).toHaveBeenCalledWith([tsCeaCue2]);
   });
 
   it('extracts CEA-708 captions from previous segment from hls', async () => {
@@ -406,9 +471,19 @@ describe('MediaSourceEngine', () => {
     mediaSourceEngine.setSelectedClosedCaptionId('CC1');
 
     await append(ContentType.VIDEO, 2);
+
+    expect(textDisplayer.appendSpy).toHaveBeenCalledTimes(3);
+    expect(textDisplayer.appendSpy).toHaveBeenCalledWith([tsCeaCue3]);
+    expect(textDisplayer.appendSpy).toHaveBeenCalledWith([tsCeaCue4]);
+    expect(textDisplayer.appendSpy).toHaveBeenCalledWith([tsCeaCue5]);
+
+    textDisplayer.appendSpy.calls.reset();
     await appendWithSeek(ContentType.VIDEO, 0);
 
-    expect(textDisplayer.appendSpy).toHaveBeenCalledTimes(6);
+    expect(textDisplayer.appendSpy).toHaveBeenCalledTimes(3);
+    expect(textDisplayer.appendSpy).toHaveBeenCalledWith([tsCeaCue0]);
+    expect(textDisplayer.appendSpy).toHaveBeenCalledWith([tsCeaCue1]);
+    expect(textDisplayer.appendSpy).toHaveBeenCalledWith([tsCeaCue2]);
   });
 
   it('buffers partial TS video segments in sequence mode', async () => {
@@ -461,6 +536,7 @@ describe('MediaSourceEngine', () => {
     mediaSourceEngine.setSelectedClosedCaptionId('CC1');
     await appendWithClosedCaptions(ContentType.VIDEO, 0);
 
-    expect(textDisplayer.appendSpy).toHaveBeenCalled();
+    expect(textDisplayer.appendSpy).toHaveBeenCalledTimes(1);
+    expect(textDisplayer.appendSpy).toHaveBeenCalledWith([mp4CeaCue0]);
   });
 });

package/test/player_integration.js

@@ -898,7 +898,7 @@ describe('Player', () => {
       expect(getBufferedBehind()).toBe(20);  // Buffered to start still.
       video.currentTime = 50;
       await waitUntilBuffered(30);
-      expect(getBufferedBehind()).toBeLessThan(30);
+      expect(getBufferedBehind()).toBeLessThan(40);  // 30 + segment_size
 
       player.configure('streaming.bufferBehind', 10);
       // We only evict content when we append a segment, so increase the
@@ -925,7 +925,7 @@ describe('Player', () => {
     }
 
     async function waitUntilBuffered(amount) {
-      for (let i = 0; i < 25; i++) {
+      for (let i = 0; i < 50; i++) {
         // We buffer from an internal segment, so this shouldn't take long to
         // buffer.
         await Util.delay(0.1);  // eslint-disable-line no-await-in-loop
@@ -933,7 +933,14 @@ describe('Player', () => {
           return;
         }
       }
-      throw new Error('Timeout waiting to buffer');
+
+      const ranges =
+          shaka.media.TimeRangesUtils.getBufferedInfo(video.buffered);
+      const currentTime = video.currentTime;
+      const target = currentTime + amount;
+
+      throw new Error('Timeout waiting to buffer! ' +
+          JSON.stringify({ranges, currentTime, target}));
     }
   });  // describe('buffering')