shaka-player 4.0.2 → 4.1.1

package/lib/text/cue.js

@@ -144,6 +144,12 @@ shaka.text.Cue = class {
      */
     this.border = '';
 
+    /**
+     * @override
+     * @exportInterface
+     */
+    this.textShadow = '';
+
     /**
      * @override
      * @exportInterface

package/lib/text/ui_text_displayer.js

@@ -411,6 +411,7 @@ shaka.text.UITextDisplayer = class {
     style.paddingRight =
         shaka.text.UITextDisplayer.convertLengthValue_(
             cue.linePadding, cue, this.videoContainer_);
+    style.textShadow = cue.textShadow;
 
     if (cue.backgroundImage) {
       style.backgroundImage = 'url(\'' + cue.backgroundImage + '\')';

package/lib/text/vtt_text_parser.js

@@ -293,6 +293,10 @@ shaka.text.VttTextParser = class {
             validStyle = true;
             cue.opacity = parseFloat(value);
             break;
+          case 'text-shadow':
+            validStyle = true;
+            cue.textShadow = value;
+            break;
           case 'white-space':
             validStyle = true;
             cue.wrapLine = value != 'noWrap';

package/lib/util/error.js

@@ -267,6 +267,12 @@ shaka.util.Error.Code = {
    */
   'ATTEMPTS_EXHAUSTED': 1010,
 
+  /**
+   * The segment is missing.
+   * <br> error.data[0] is the URI.
+   */
+  'SEGMENT_MISSING': 1011,
+
 
   /** The text parser failed to parse a text stream due to an invalid header. */
   'INVALID_TEXT_HEADER': 2000,

package/lib/util/fake_event.js

@@ -144,3 +144,42 @@ shaka.util.FakeEvent = class {
    */
   stopPropagation() {}
 };
+
+
+/**
+ * An internal enum that contains the string values of all of the player events.
+ * This exists primarily to act as an implicit list of events, for tests.
+ *
+ * @enum {string}
+ */
+shaka.util.FakeEvent.EventName = {
+  AbrStatusChanged: 'abrstatuschanged',
+  Adaptation: 'adaptation',
+  Buffering: 'buffering',
+  DownloadFailed: 'downloadfailed',
+  DownloadHeadersReceived: 'downloadheadersreceived',
+  DrmSessionUpdate: 'drmsessionupdate',
+  Emsg: 'emsg',
+  Error: 'error',
+  ExpirationUpdated: 'expirationupdated',
+  GapJumped: 'gapjumped',
+  Loaded: 'loaded',
+  Loading: 'loading',
+  ManifestParsed: 'manifestparsed',
+  MediaQualityChanged: 'mediaqualitychanged',
+  Metadata: 'metadata',
+  OnStateChange: 'onstatechange',
+  OnStateIdle: 'onstateidle',
+  RateChange: 'ratechange',
+  SessionDataEvent: 'sessiondata',
+  StallDetected: 'stalldetected',
+  Streaming: 'streaming',
+  TextChanged: 'textchanged',
+  TextTrackVisibility: 'texttrackvisibility',
+  TimelineRegionAdded: 'timelineregionadded',
+  TimelineRegionEnter: 'timelineregionenter',
+  TimelineRegionExit: 'timelineregionexit',
+  TracksChanged: 'trackschanged',
+  Unloading: 'unloading',
+  VariantChanged: 'variantchanged',
+};

package/lib/util/player_configuration.js

@@ -74,6 +74,7 @@ shaka.util.PlayerConfiguration = class {
       logLicenseExchange: false,
       updateExpirationTime: 1,
       preferredKeySystems: [],
+      keySystemsMapping: {},
     };
 
     const manifest = {
@@ -169,6 +170,7 @@ shaka.util.PlayerConfiguration = class {
       updateIntervalSeconds: 1,
       dispatchAllEmsgBoxes: false,
       observeQualityChanges: false,
+      maxDisabledTime: 30,
     };
 
     // Some browsers will stop earlier than others before a gap (e.g., Edge

package/lib/util/stats.js

@@ -31,6 +31,11 @@ shaka.util.Stats = class {
     /** @private {number} */
     this.totalCorruptedFrames_ = NaN;
 
+    /** @private {number} */
+    this.totalStallsDetected_ = NaN;
+    /** @private {number} */
+    this.totalGapsJumped_ = NaN;
+
     /** @private {number} */
     this.completionPercent_ = NaN;
 
@@ -76,7 +81,6 @@ shaka.util.Stats = class {
     this.totalDecodedFrames_ = decoded;
   }
 
-
   /**
    * Update corrupted frames. This will replace the previous values.
    *
@@ -86,6 +90,25 @@ shaka.util.Stats = class {
     this.totalCorruptedFrames_ = corrupted;
   }
 
+  /**
+   * Update number of stalls detected. This will replace the previous value.
+   *
+   * @param {number} stallsDetected
+   */
+  setStallsDetected(stallsDetected) {
+    this.totalStallsDetected_ = stallsDetected;
+  }
+
+  /**
+   * Update number of playback gaps jumped over. This will replace the previous
+   * value.
+   *
+   * @param {number} gapsJumped
+   */
+  setGapsJumped(gapsJumped) {
+    this.totalGapsJumped_ = gapsJumped;
+  }
+
   /**
    * Set the width and height of the video we are currently playing.
    *
@@ -208,6 +231,8 @@ shaka.util.Stats = class {
       decodedFrames: this.totalDecodedFrames_,
       droppedFrames: this.totalDroppedFrames_,
       corruptedFrames: this.totalCorruptedFrames_,
+      stallsDetected: this.totalStallsDetected_,
+      gapsJumped: this.totalGapsJumped_,
       estimatedBandwidth: this.bandwidthEstimate_,
       completionPercent: this.completionPercent_,
       loadLatency: this.loadLatencySeconds_,
@@ -238,6 +263,8 @@ shaka.util.Stats = class {
       decodedFrames: NaN,
       droppedFrames: NaN,
       corruptedFrames: NaN,
+      stallsDetected: NaN,
+      gapsJumped: NaN,
       estimatedBandwidth: NaN,
       completionPercent: NaN,
       loadLatency: NaN,

package/lib/util/stream_utils.js

@@ -329,6 +329,13 @@ shaka.util.StreamUtils = class {
 
     const video = variant.video;
 
+    if (variant.disabledUntilTime != 0) {
+      if (variant.disabledUntilTime > Date.now() / 1000) {
+        return false;
+      }
+      variant.disabledUntilTime = 0;
+    }
+
     // |video.width| and |video.height| can be undefined, which breaks
     // the math, so make sure they are there first.
     if (video && video.width && video.height) {
@@ -1008,6 +1015,7 @@ shaka.util.StreamUtils = class {
       track.channelsCount = audio.channelsCount;
       track.audioSamplingRate = audio.audioSamplingRate;
       track.audioBandwidth = audio.bandwidth || null;
+      track.spatialAudio = audio.spatialAudio;
       track.label = audio.label;
       track.audioRoles = audio.roles;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.0.2",
+  "version": "4.1.1",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -96,7 +96,7 @@
     "prepublishOnly": "python build/checkversion.py && python build/all.py --force"
   },
   "dependencies": {
-    "eme-encryption-scheme-polyfill": "^2.0.3"
+    "eme-encryption-scheme-polyfill": "^2.0.5"
   },
   "engines": {
     "node": ">=14"

package/test/cast/cast_proxy_unit.js

@@ -11,6 +11,7 @@ describe('CastProxy', () => {
 
   const originalCastSender = shaka.cast.CastSender;
   const fakeAppId = 'fake app ID';
+  const fakeAndroidReceiverCompatible = false;
 
   let mockPlayer;
   let mockSender;
@@ -31,7 +32,8 @@ describe('CastProxy', () => {
     mockPlayer = createMockPlayer();
     mockSender = null;
 
-    proxy = new CastProxy(mockVideo, mockPlayer, fakeAppId);
+    proxy = new CastProxy(mockVideo, mockPlayer, fakeAppId,
+        fakeAndroidReceiverCompatible);
   });
 
   afterEach(async () => {

package/test/cast/cast_sender_unit.js

@@ -13,6 +13,7 @@ describe('CastSender', () => {
   const originalStatusDelay = shaka.cast.CastSender.STATUS_DELAY;
 
   const fakeAppId = 'asdf';
+  const fakeAndroidReceiverCompatible = false;
   const fakeInitState = {
     manifest: null,
     player: null,
@@ -52,7 +53,8 @@ describe('CastSender', () => {
     sender = new CastSender(
         fakeAppId, Util.spyFunc(onStatusChanged),
         Util.spyFunc(onFirstCastStateUpdate), Util.spyFunc(onRemoteEvent),
-        Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired));
+        Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired),
+        fakeAndroidReceiverCompatible);
   });
 
   afterEach(async () => {
@@ -87,7 +89,12 @@ describe('CastSender', () => {
       expect(sender.apiReady()).toBe(true);
       expect(sender.hasReceivers()).toBe(false);
       expect(onStatusChanged).toHaveBeenCalled();
-      expect(mockCastApi.SessionRequest).toHaveBeenCalledWith(fakeAppId);
+      expect(mockCastApi.SessionRequest).toHaveBeenCalledWith(
+          fakeAppId,
+          /* capabilities= */ [],
+          /* timeout= */ null,
+          fakeAndroidReceiverCompatible,
+          /* credentialsData= */ null);
       expect(mockCastApi.initialize).toHaveBeenCalled();
     });
 
@@ -97,7 +104,12 @@ describe('CastSender', () => {
       expect(sender.apiReady()).toBe(true);
       expect(sender.hasReceivers()).toBe(false);
       expect(onStatusChanged).toHaveBeenCalled();
-      expect(mockCastApi.SessionRequest).toHaveBeenCalledWith(fakeAppId);
+      expect(mockCastApi.SessionRequest).toHaveBeenCalledWith(
+          fakeAppId,
+          /* capabilities= */ [],
+          /* timeout= */ null,
+          fakeAndroidReceiverCompatible,
+          /* credentialsData= */ null);
       expect(mockCastApi.initialize).toHaveBeenCalled();
     });
   });
@@ -122,7 +134,8 @@ describe('CastSender', () => {
       sender = new CastSender(
           fakeAppId, Util.spyFunc(onStatusChanged),
           Util.spyFunc(onFirstCastStateUpdate), Util.spyFunc(onRemoteEvent),
-          Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired));
+          Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired),
+          /* androidReceiverCompatible= */ false);
       sender.init();
       // You get an initial call to onStatusChanged when it initializes.
       expect(onStatusChanged).toHaveBeenCalledTimes(3);
@@ -256,7 +269,8 @@ describe('CastSender', () => {
     sender = new CastSender(
         fakeAppId, Util.spyFunc(onStatusChanged),
         Util.spyFunc(onFirstCastStateUpdate), Util.spyFunc(onRemoteEvent),
-        Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired));
+        Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired),
+        /* androidReceiverCompatible= */ false);
     sender.init();
 
     // The sender should automatically rejoin the session, without needing
@@ -288,7 +302,8 @@ describe('CastSender', () => {
     sender = new CastSender(
         fakeAppId, Util.spyFunc(onStatusChanged),
         Util.spyFunc(onFirstCastStateUpdate), Util.spyFunc(onRemoteEvent),
-        Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired));
+        Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired),
+        /* androidReceiverCompatible= */ false);
     sender.init();
 
     expect(sender.isCasting()).toBe(false);

package/test/demo/demo_unit.js

@@ -94,7 +94,8 @@ describe('Demo', () => {
           .add('playRangeStart')
           .add('playRangeEnd')
           .add('manifest.dash.keySystemsByURI')
-          .add('manifest.hls.mediaPlaylistFullMimeType');
+          .add('manifest.hls.mediaPlaylistFullMimeType')
+          .add('drm.keySystemsMapping');
 
       /**
        * @param {!Object} section

package/test/hls/hls_parser_unit.js

@@ -2021,6 +2021,10 @@ describe('HlsParser', () => {
   });
 
   describe('produces syncTime', () => {
+    // Corresponds to "2000-01-01T00:00:00.00Z".
+    // All the PROGRAM-DATE-TIME values in the tests below are at or after this.
+    const syncTimeBase = 946684800;
+
     /**
      * @param {number} startTime
      * @param {number} endTime
@@ -2039,9 +2043,10 @@ describe('HlsParser', () => {
     /**
      * @param {string} media
      * @param {!Array.<number>} startTimes
+     * @param {number} syncTimeOffset
      * @param {(function(!shaka.media.SegmentReference))=} modifyFn
      */
-    async function test(media, startTimes, modifyFn) {
+    async function test(media, startTimes, syncTimeOffset, modifyFn) {
       const master = [
         '#EXTM3U\n',
         '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1,vtt",',
@@ -2053,7 +2058,8 @@ describe('HlsParser', () => {
       for (let i = 0; i < startTimes.length - 1; i++) {
         const startTime = startTimes[i];
         const endTime = startTimes[i + 1];
-        const reference = makeReference(startTime, endTime, startTime);
+        const reference = makeReference(
+            startTime, endTime, syncTimeOffset + startTime);
         if (modifyFn) {
           modifyFn(reference);
         }
@@ -2100,7 +2106,7 @@ describe('HlsParser', () => {
         '#EXT-X-PROGRAM-DATE-TIME:2000-01-01T00:00:25.00Z\n',
         '#EXTINF:5,\n',
         'main.mp4',
-      ].join(''), [0, 5, 10, 15, 20, 25]);
+      ].join(''), [0, 5, 10, 15, 20, 25], syncTimeBase + 5);
     });
 
     it('when some EXT-X-PROGRAM-DATE-TIME values are missing', async () => {
@@ -2122,7 +2128,7 @@ describe('HlsParser', () => {
         'main.mp4\n',
         '#EXTINF:4,\n',
         'main.mp4',
-      ].join(''), [0, 2, 7, 12, 17, 19, 23]);
+      ].join(''), [0, 2, 7, 12, 17, 19, 23], syncTimeBase + 8);
     });
 
     it('except when ignoreManifestProgramDateTime is set', async () => {
@@ -2148,7 +2154,7 @@ describe('HlsParser', () => {
         '#EXT-X-PROGRAM-DATE-TIME:2000-01-01T00:00:25.00Z\n',
         '#EXTINF:5,\n',
         'main.mp4',
-      ].join(''), [0, 5, 10, 15, 20, 25], (reference) => {
+      ].join(''), [0, 5, 10, 15, 20, 25], syncTimeBase + 5, (reference) => {
         reference.syncTime = null;
       });
     });
@@ -2176,11 +2182,11 @@ describe('HlsParser', () => {
         '#EXT-X-PROGRAM-DATE-TIME:2000-01-01T00:00:25.00Z\n',
         '#EXTINF:5,\n',
         'main.mp4',
-      ].join(''), [0, 5, 10, 15, 20, 25], (reference) => {
+      ].join(''), [0, 5, 10, 15, 20, 25], syncTimeBase + 5, (reference) => {
         if (reference.startTime == 10) {
           reference.partialReferences = [
-            makeReference(10, 12.5, 10),
-            makeReference(12.5, 15, 12.5),
+            makeReference(10, 12.5, syncTimeBase + 15),
+            makeReference(12.5, 15, syncTimeBase + 17.5),
           ];
         }
       });
@@ -3555,4 +3561,92 @@ describe('HlsParser', () => {
 
     await testHlsParser(media, '', manifest);
   });
+
+  it('syncs on sequence with ignoreManifestProgramDateTime', async () => {
+    const config = shaka.util.PlayerConfiguration.createDefault().manifest;
+    config.hls.ignoreManifestProgramDateTime = true;
+    parser.configure(config);
+
+    const master = [
+      '#EXTM3U\n',
+      '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud1",LANGUAGE="eng",URI="audio"\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1,mp4a",',
+      'RESOLUTION=960x540,FRAME-RATE=60,AUDIO="aud1"\n',
+      'video\n',
+    ].join('');
+
+    const video = [
+      '#EXTM3U\n',
+      '#EXT-X-TARGETDURATION:5\n',
+      '#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
+      '#EXT-X-MEDIA-SEQUENCE:1\n',
+      '#EXTINF:5,\n',
+      'video1.mp4\n',
+      '#EXTINF:5,\n',
+      'video2.mp4\n',
+      '#EXTINF:5,\n',
+      'video3.mp4\n',
+    ].join('');
+
+    const audio = [
+      '#EXTM3U\n',
+      '#EXT-X-TARGETDURATION:5\n',
+      '#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
+      '#EXT-X-MEDIA-SEQUENCE:3\n',
+      '#EXTINF:5,\n',
+      'audio3.mp4\n',
+      '#EXTINF:5,\n',
+      'audio4.mp4\n',
+    ].join('');
+
+    const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+      manifest.sequenceMode = true;
+      manifest.anyTimeline();
+      manifest.addPartialVariant((variant) => {
+        variant.language = 'en';
+        variant.bandwidth = 200;
+        variant.addPartialStream(ContentType.VIDEO, (stream) => {
+          stream.mime('video/mp4', 'avc1');
+          stream.size(960, 540);
+          stream.frameRate = 60;
+        });
+        variant.addPartialStream(ContentType.AUDIO, (stream) => {
+          stream.language = 'en';
+          stream.mime('audio/mp4', 'mp4a');
+        });
+      });
+    });
+
+    fakeNetEngine
+        .setResponseText('test:/master', master)
+        .setResponseText('test:/audio', audio)
+        .setResponseText('test:/video', video)
+        .setResponseValue('test:/init.mp4', initSegmentData);
+
+    const actualManifest = await parser.start('test:/master', playerInterface);
+    expect(actualManifest).toEqual(manifest);
+
+    const actualVideo = actualManifest.variants[0].video;
+    await actualVideo.createSegmentIndex();
+    goog.asserts.assert(actualVideo.segmentIndex != null, 'Null segmentIndex!');
+
+    const actualAudio = actualManifest.variants[0].audio;
+    await actualAudio.createSegmentIndex();
+    goog.asserts.assert(actualAudio.segmentIndex != null, 'Null segmentIndex!');
+
+    // Verify that the references are aligned on sequence number.
+    const videoSegments = Array.from(actualVideo.segmentIndex);
+    const audioSegments = Array.from(actualAudio.segmentIndex);
+
+    // The first two were dropped to align with the audio.
+    expect(videoSegments.map((ref) => ref.getUris()[0])).toEqual([
+      'test:/video3.mp4',
+    ]);
+    // Audio has a 4th segment that video doesn't, but that doesn't get clipped
+    // or used as the base.  Alignment is truly based on media sequence number.
+    expect(audioSegments.map((ref) => ref.getUris()[0])).toEqual([
+      'test:/audio3.mp4',
+      'test:/audio4.mp4',
+    ]);
+  });
 });

package/test/media/adaptation_set_unit.js

@@ -179,6 +179,7 @@ describe('AdaptationSet', () => {
       audio: audio,
       bandwidth: 1024,
       id: id,
+      disabledUntilTime: 0,
       language: '',
       primary: false,
       video: video,