shaka-player 4.6.7 → 4.6.8

package/lib/ads/client_side_ad.js

@@ -155,6 +155,7 @@ shaka.ads.ClientSideAd = class {
    * @export
    */
   setVolume(volume) {
+    this.video_.volume = volume;
     return this.manager_.setVolume(volume);
   }
 
@@ -197,13 +198,14 @@ shaka.ads.ClientSideAd = class {
    * @export
    */
   setMuted(muted) {
+    this.video_.muted = muted;
     // Emulate the "mute" functionality, where current, pre-mute
     // volume is saved and can be restored on unmute.
     if (muted) {
       this.volume_ = this.getVolume();
-      this.setVolume(0);
+      this.manager_.setVolume(0);
     } else {
-      this.setVolume(this.volume_);
+      this.manager_.setVolume(this.volume_);
     }
   }
 

package/lib/ads/client_side_ad_manager.js

@@ -234,10 +234,12 @@ shaka.ads.ClientSideAdManager = class {
         videoPlayHead.currentTime = this.video_.currentTime;
       });
       this.eventManager_.listen(this.video_, 'volumechange', () => {
+        if (!this.ad_) {
+          return;
+        }
+        this.ad_.setVolume(this.video_.volume);
         if (this.video_.muted) {
-          this.imaAdsManager_.setVolume(0);
-        } else {
-          this.imaAdsManager_.setVolume(this.video_.volume);
+          this.ad_.setMuted(true);
         }
       });
     }

package/lib/cea/cea608_memory.js

@@ -79,7 +79,7 @@ shaka.cea.Cea608Memory = class {
    * @return {?shaka.extern.ICaptionDecoder.ClosedCaption}
    */
   forceEmit(startTime, endTime) {
-    const stream = `CC${(this.fieldNum_<< 1) | this.channelNum_ +1}`;
+    const stream = `CC${((this.fieldNum_<< 1) | this.channelNum_) + 1}`;
     const topLevelCue = new shaka.text.Cue(
         startTime, endTime, /* payload= */ '');
     topLevelCue.lineInterpretation =

package/lib/cea/cea_decoder.js

@@ -283,7 +283,7 @@ shaka.cea.CeaDecoder = class {
     // Get the correct stream for this caption packet (CC1, ..., CC4)
     const selectedChannel = fieldNum ?
         this.currentField2Channel_ : this.currentField1Channel_;
-    const selectedMode = `CC${(fieldNum << 1) | selectedChannel + 1}`;
+    const selectedMode = `CC${((fieldNum << 1) | selectedChannel) + 1}`;
     const selectedStream = this.cea608ModeToStream_.get(selectedMode);
 
     // Check for bad frames (bad pairs). This can be two 0xff, two 0x00, or any

package/lib/hls/hls_parser.js

@@ -979,6 +979,22 @@ shaka.hls.HlsParser = class {
         this.presentationTimeline_.setSegmentAvailabilityDuration(
             segmentAvailabilityDuration);
       }
+
+      if (!this.presentationTimeline_.isStartTimeLocked()) {
+        const streamInfos = Array.from(this.uriToStreamInfosMap_.values());
+        const activeStreamInfos =
+            streamInfos.filter((s) => s.stream.segmentIndex);
+        for (const streamInfo of activeStreamInfos) {
+          if (streamInfo.type != 'audio' && streamInfo.type != 'video') {
+            continue;
+          }
+          const firstReference = streamInfo.stream.segmentIndex.get(0);
+          if (firstReference && firstReference.syncTime) {
+            const syncTime = firstReference.syncTime;
+            this.presentationTimeline_.setPresentationStartTime(syncTime);
+          }
+        }
+      }
     } else {
       // Use the minimum duration as the presentation duration.
       this.presentationTimeline_.setDuration(this.getMinDuration_());

package/lib/media/media_source_engine.js

@@ -165,9 +165,6 @@ shaka.media.MediaSourceEngine = class {
 
       const mediaSource = new ManagedMediaSource();
 
-      this.eventManager_.listenOnce(
-          mediaSource, 'sourceopen', () => this.onSourceOpen_(p));
-
       this.eventManager_.listen(
           mediaSource, 'startstreaming', () => {
             this.streamingAllowed_ = true;
@@ -178,6 +175,9 @@ shaka.media.MediaSourceEngine = class {
             this.streamingAllowed_ = false;
           });
 
+      this.eventManager_.listenOnce(
+          mediaSource, 'sourceopen', () => this.onSourceOpen_(p));
+
       // Correctly set when playback has begun.
       this.eventManager_.listenOnce(this.video_, 'playing', () => {
         this.playbackHasBegun_ = true;

package/lib/media/presentation_timeline.js

@@ -328,6 +328,17 @@ shaka.media.PresentationTimeline = class {
   }
 
 
+  /**
+   * Returns if the presentation timeline's start time is locked.
+   *
+   * @return {boolean}
+   * @export
+   */
+  isStartTimeLocked() {
+    return this.startTimeLocked_;
+  }
+
+
   /**
    * Gives PresentationTimeline a Stream's minimum segment start time.
    *

package/lib/offline/session_deleter.js

@@ -71,14 +71,6 @@ shaka.offline.SessionDeleter = class {
       return [];
     }
 
-    try {
-      await drmEngine.setServerCertificate();
-    } catch (e) {
-      shaka.log.warning('Error setting server certificate', e);
-      await drmEngine.destroy();
-      return [];
-    }
-
     /** @type {!Array.<string>} */
     const sessionIds = [];
     await Promise.all(bucket.sessionIds.map(async (sessionId) => {

package/lib/player.js

@@ -4768,12 +4768,18 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     const references = [];
     for (const cue of cues) {
-      const imageUri = shaka.util.ManifestParserUtils.resolveUris(
-          [uri], [cue.payload])[0];
+      let uris = null;
+      const getUris = () => {
+        if (uris == null) {
+          uris = shaka.util.ManifestParserUtils.resolveUris(
+              [uri], [cue.payload]);
+        }
+        return uris || [];
+      };
       const reference = new shaka.media.SegmentReference(
           cue.startTime,
           cue.endTime,
-          () => [imageUri],
+          getUris,
           /* startByte= */ 0,
           /* endByte= */ null,
           /* initSegmentReference= */ null,
@@ -4781,8 +4787,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           /* appendWindowStart= */ 0,
           /* appendWindowEnd= */ Infinity,
       );
-      if (imageUri.includes('#xywh')) {
-        const spriteInfo = imageUri.split('#xywh=')[1].split(',');
+      if (cue.payload.includes('#xywh')) {
+        const spriteInfo = cue.payload.split('#xywh=')[1].split(',');
         if (spriteInfo.length === 4) {
           reference.setThumbnailSprite({
             height: parseInt(spriteInfo[3], 10),
@@ -6779,7 +6785,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.6.7' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.6.8' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/patchedmediakeys_apple.js

@@ -791,9 +791,3 @@ shaka.polyfill.PatchedMediaKeysApple.MediaKeyStatusMap = class {
     goog.asserts.assert(false, 'Not used!  Provided only for the compiler.');
   }
 };
-
-if (!navigator.requestMediaKeySystemAccess ||
-    // eslint-disable-next-line no-restricted-syntax
-    !MediaKeySystemAccess.prototype.getConfiguration) {
-  shaka.polyfill.register(shaka.polyfill.PatchedMediaKeysApple.install);
-}

package/lib/text/vtt_text_parser.js

@@ -451,6 +451,11 @@ shaka.text.VttTextParser = class {
    */
   static parseCueStyles(payload, rootCue, styles) {
     const VttTextParser = shaka.text.VttTextParser;
+    // Optimization for unstyled payloads.
+    if (!payload.includes('<')) {
+      rootCue.payload = VttTextParser.htmlUnescape_(payload);
+      return;
+    }
     if (styles.size === 0) {
       VttTextParser.addDefaultTextColor_(styles);
     }

package/package.json

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

package/test/cea/cea_decoder_unit.js

@@ -44,6 +44,42 @@ describe('CeaDecoder', () => {
       decoder.clear();
     });
 
+    it('painton captions on CC4', () => {
+      const controlCount = 0x03;
+      const captionData = 0xc0 | controlCount;
+      const paintonCaptionCC4Packet = new Uint8Array([
+        ...atscCaptionInitBytes, captionData, /* padding= */ 0xff,
+        0xfd, 0x9d, 0x29, // Paint-on mode (RDC control code).
+        0xfd, 0xf4, 0xe5, // t, e
+        0xfd, 0x73, 0xf4, // s, t
+      ]);
+
+      const startTimeCaption1 = 1;
+      const startTimeCaption2 = 2;
+      const expectedText = 'test';
+
+      const topLevelCue = new shaka.text.Cue(startTimeCaption1,
+          startTimeCaption2, '');
+      topLevelCue.line = 10;
+      topLevelCue.lineInterpretation =
+          shaka.text.Cue.lineInterpretation.PERCENTAGE;
+      topLevelCue.nestedCues = [
+        CeaUtils.createDefaultCue(
+            startTimeCaption1, startTimeCaption2, expectedText),
+      ];
+
+      const expectedCaptions = [{
+        stream: 'CC4',
+        cue: topLevelCue,
+      }];
+
+      decoder.extract(paintonCaptionCC4Packet, startTimeCaption1);
+      decoder.extract(eraseDisplayedMemory, startTimeCaption2);
+      const captions = decoder.decode();
+
+      expect(captions).toEqual(expectedCaptions);
+    });
+
     it('green and underlined popon caption data on CC3', () => {
       const controlCount = 0x08;
       const captionData = 0xc0 | controlCount;

package/test/media/media_source_engine_unit.js

@@ -38,6 +38,10 @@ describe('MediaSourceEngine', () => {
   const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
   const originalIsTypeSupported = window.MediaSource.isTypeSupported;
+  let originalIsTypeSupportedManaged;
+  if (window.ManagedMediaSource) {
+    originalIsTypeSupportedManaged = window.ManagedMediaSource.isTypeSupported;
+  }
   const originalTextEngine = shaka.text.TextEngine;
   const originalCreateMediaSource =
       // eslint-disable-next-line no-restricted-syntax
@@ -98,10 +102,20 @@ describe('MediaSourceEngine', () => {
       const type = mimeType.split('/')[0];
       return type == 'video' || type == 'audio';
     };
+    if (window.ManagedMediaSource) {
+      window.ManagedMediaSource.isTypeSupported = (mimeType) => {
+        const type = mimeType.split('/')[0];
+        return type == 'video' || type == 'audio';
+      };
+    }
   });
 
   afterAll(() => {
     window.MediaSource.isTypeSupported = originalIsTypeSupported;
+    if (window.ManagedMediaSource) {
+      window.ManagedMediaSource.isTypeSupported =
+          originalIsTypeSupportedManaged;
+    }
     shaka.transmuxer.TransmuxerEngine.findTransmuxer =
         originalFindTransmuxer;
     shaka.transmuxer.TransmuxerEngine.convertCodecs =
@@ -206,6 +220,7 @@ describe('MediaSourceEngine', () => {
       shaka.media.MediaSourceEngine.createObjectURL;
     const originalRevokeObjectURL = window.URL.revokeObjectURL;
     const originalMediaSource = window.MediaSource;
+    const originalManagedMediaSource = window.ManagedMediaSource;
     /** @type {jasmine.Spy} */
     let createObjectURLSpy;
     /** @type {jasmine.Spy} */
@@ -237,6 +252,9 @@ describe('MediaSourceEngine', () => {
         return mockMediaSource;
       });
       window.MediaSource = Util.spyFunc(mediaSourceSpy);
+      if (window.ManagedMediaSource) {
+        window.ManagedMediaSource = Util.spyFunc(mediaSourceSpy);
+      }
 
       await mediaSourceEngine.destroy();
     });
@@ -244,6 +262,7 @@ describe('MediaSourceEngine', () => {
     afterAll(() => {
       shaka.media.MediaSourceEngine.createObjectURL = originalCreateObjectURL;
       window.MediaSource = originalMediaSource;
+      window.ManagedMediaSource = originalManagedMediaSource;
       window.URL.revokeObjectURL = originalRevokeObjectURL;
     });
 
@@ -270,7 +289,11 @@ describe('MediaSourceEngine', () => {
           video,
           new shaka.test.FakeTextDisplayer());
 
-      expect(mockMediaSource.addEventListener).toHaveBeenCalledTimes(1);
+      if (window.ManagedMediaSource) {
+        expect(mockMediaSource.addEventListener).toHaveBeenCalledTimes(3);
+      } else {
+        expect(mockMediaSource.addEventListener).toHaveBeenCalledTimes(1);
+      }
       expect(mockMediaSource.addEventListener.calls.mostRecent().args[0])
           .toBe('sourceopen');
       expect(typeof onSourceOpenListener).toBe(typeof Function);

package/test/player_load_graph_integration.js

@@ -394,12 +394,16 @@ describe('Player Load Graph', () => {
   // that the player will behave as expected when media source is missing.
   describe('without media source', () => {
     let mediaSource;
+    let managedMediaSource;
 
     beforeEach(async () => {
       // Remove our media source support. In order to remove it, we need to set
       // it via [] notation or else closure will stop us.
       mediaSource = window.MediaSource;
       window['MediaSource'] = undefined;
+      managedMediaSource = window.ManagedMediaSource;
+      window['ManagedMediaSource'] = undefined;
+
 
       createPlayer();
       await shaka.test.Util.delay(/* seconds= */ 0.25);
@@ -409,6 +413,7 @@ describe('Player Load Graph', () => {
       // Restore our media source support to what it was before. If we did not
       // have support before, this will do nothing.
       window['MediaSource'] = mediaSource;
+      window['ManagedMediaSource'] = managedMediaSource;
     });
 
     it('attaching ignores init media source flag', async () => {

package/test/player_unit.js

@@ -12,6 +12,10 @@ describe('Player', () => {
   const originalLogWarn = shaka.log.warning;
   const originalLogAlwaysWarn = shaka.log.alwaysWarn;
   const originalIsTypeSupported = window.MediaSource.isTypeSupported;
+  let originalIsTypeSupportedManaged;
+  if (window.ManagedMediaSource) {
+    originalIsTypeSupportedManaged = window.ManagedMediaSource.isTypeSupported;
+  }
   const originalDecodingInfo = navigator.mediaCapabilities.decodingInfo;
 
   const fakeManifestUri = 'fake-manifest-uri';
@@ -67,6 +71,12 @@ describe('Player', () => {
       const type = mimeType.split('/')[0];
       return type == 'video' || type == 'audio';
     };
+    if (window.ManagedMediaSource) {
+      window.ManagedMediaSource.isTypeSupported = (mimeType) => {
+        const type = mimeType.split('/')[0];
+        return type == 'video' || type == 'audio';
+      };
+    }
 
     // Since this is not an integration test, we don't want MediaCapabilities to
     // fail assertions based on browser support for types.  Pretend that all
@@ -178,6 +188,10 @@ describe('Player', () => {
       shaka.log.warning = originalLogWarn;
       shaka.log.alwaysWarn = originalLogAlwaysWarn;
       window.MediaSource.isTypeSupported = originalIsTypeSupported;
+      if (window.ManagedMediaSource) {
+        window.ManagedMediaSource.isTypeSupported =
+            originalIsTypeSupportedManaged;
+      }
       shaka.media.ManifestParser.unregisterParserByMime(fakeMimeType);
       navigator.mediaCapabilities.decodingInfo = originalDecodingInfo;
       onError.calls.reset();
@@ -2900,6 +2914,9 @@ describe('Player', () => {
   describe('unplayable content', () => {
     it('throws CONTENT_UNSUPPORTED_BY_BROWSER', async () => {
       window.MediaSource.isTypeSupported = (mimeType) => false;
+      if (window.ManagedMediaSource) {
+        window.ManagedMediaSource.isTypeSupported = (mimeType) => false;
+      }
 
       navigator.mediaCapabilities.decodingInfo = async (config) => {
         await Promise.resolve();

package/ui/play_button.js

@@ -72,6 +72,11 @@ shaka.ui.PlayButton = class extends shaka.ui.Element {
       this.updateIcon();
     });
 
+    this.eventManager.listen(this.adManager, AdManager.AD_STOPPED, () => {
+      this.updateAriaLabel();
+      this.updateIcon();
+    });
+
     this.eventManager.listen(this.button, 'click', () => {
       if (this.ad && this.ad.isLinear()) {
         this.controls.playPauseAd();
@@ -99,6 +104,18 @@ shaka.ui.PlayButton = class extends shaka.ui.Element {
     return this.controls.presentationIsPaused();
   }
 
+  /**
+   * @return {boolean}
+   * @protected
+   */
+  isEnded() {
+    if (this.ad && this.ad.isLinear()) {
+      return false;
+    }
+
+    return this.video.ended;
+  }
+
   /**
    * Called when the button's aria label needs to change.
    * To be overridden by subclasses.

package/ui/small_play_button.js

@@ -38,7 +38,7 @@ shaka.ui.SmallPlayButton = class extends shaka.ui.PlayButton {
   /** @override */
   updateIcon() {
     const Icons = shaka.ui.Enums.MaterialDesignIcons;
-    if (this.video.ended) {
+    if (this.isEnded()) {
       this.button.textContent = Icons.REPLAY;
     } else {
       this.button.textContent = this.isPaused() ? Icons.PLAY : Icons.PAUSE;
@@ -48,7 +48,7 @@ shaka.ui.SmallPlayButton = class extends shaka.ui.PlayButton {
   /** @override */
   updateAriaLabel() {
     const LocIds = shaka.ui.Locales.Ids;
-    if (this.video.ended) {
+    if (this.isEnded()) {
       this.button.ariaLabel = this.localization.resolve(LocIds.REPLAY);
     } else {
       const label = this.isPaused() ? LocIds.PLAY : LocIds.PAUSE;