shaka-player 4.3.6 → 4.3.7

package/docs/tutorials/welcome.md

@@ -29,7 +29,7 @@ You can build Shaka on Linux, Windows, or Mac.
 To get the sources and compile the library, you will need:
   * {@link https://git-scm.com/downloads Git v1.9+}
   * {@link https://www.python.org/downloads/ Python v2.7 or v3.5+}
-  * {@link https://java.com/en/download/ Java Runtime Environment v14+}
+  * {@link https://learn.microsoft.com/en-us/java/openjdk/download Java Runtime Environment v14+}
   * {@link https://nodejs.org/en/download/ NodeJS v14+}
   * A local web server, such as {@link https://httpd.apache.org/ Apache}
     * _NOTE: A local web server is required because browsers place restrictions

package/lib/cea/mp4_cea_parser.js

@@ -275,6 +275,7 @@ shaka.cea.Mp4CeaParser = class {
       const naluHeader = reader.readUint8();
       let naluType = null;
       let isSeiMessage = false;
+      let naluHeaderSize = 1;
 
       goog.asserts.assert(this.bitstreamFormat_ != BitstreamFormat.UNKNOWN,
           'Bitstream format should have been checked before now!');
@@ -285,6 +286,8 @@ shaka.cea.Mp4CeaParser = class {
           break;
 
         case BitstreamFormat.H265:
+          naluHeaderSize = 2;
+          reader.skip(1);
           naluType = (naluHeader >> 1) & 0x3f;
           isSeiMessage =
               naluType == ICeaParser.H265_PREFIX_NALU_TYPE_SEI ||
@@ -304,7 +307,7 @@ shaka.cea.Mp4CeaParser = class {
 
         const pts = (time + timeOffset)/timescale;
         for (const packet of this.seiProcessor_
-            .process(reader.readBytes(naluSize - 1))) {
+            .process(reader.readBytes(naluSize - naluHeaderSize))) {
           captionPackets.push({
             packet,
             pts,
@@ -312,7 +315,7 @@ shaka.cea.Mp4CeaParser = class {
         }
       } else {
         try {
-          reader.skip(naluSize - 1);
+          reader.skip(naluSize - naluHeaderSize);
         } catch (e) {
           // It is necessary to ignore this error because it can break the start
           // of playback even if the user does not want to see the subtitles.

package/lib/hls/hls_parser.js

@@ -319,6 +319,9 @@ shaka.hls.HlsParser = class {
       this.presentationTimeline_.setDuration(Math.min(...maxTimestamps));
       this.playerInterface_.updateDuration();
     }
+    if (stillLive) {
+      this.determineDuration_();
+    }
   }
 
   /**
@@ -400,9 +403,16 @@ shaka.hls.HlsParser = class {
           mediaSequenceNumber);
       stream.segmentIndex.evict(playlistStartTime);
     }
+    const oldSegment = segments[0];
+    goog.asserts.assert(oldSegment, 'Should have segments!');
+
+    streamInfo.minTimestamp = oldSegment.startTime;
+
     const newestSegment = segments[segments.length - 1];
     goog.asserts.assert(newestSegment, 'Should have segments!');
 
+    streamInfo.maxTimestamp = newestSegment.endTime;
+
     // Once the last segment has been added to the playlist,
     // #EXT-X-ENDLIST tag will be appended.
     // If that happened, treat the rest of the EVENT presentation as VOD.
@@ -413,7 +423,6 @@ shaka.hls.HlsParser = class {
       // Flag this for later.  We don't convert the whole presentation into VOD
       // until we've seen the ENDLIST tag for all active playlists.
       streamInfo.hasEndList = true;
-      streamInfo.maxTimestamp = newestSegment.endTime;
     }
   }
 
@@ -576,6 +585,9 @@ shaka.hls.HlsParser = class {
    * @private
    */
   offsetStreamInfo_(streamInfo, offset) {
+    // Adjust our accounting of the minimum timestamp.
+    streamInfo.minTimestamp += offset;
+
     // Adjust our accounting of the maximum timestamp.
     streamInfo.maxTimestamp += offset;
     goog.asserts.assert(streamInfo.maxTimestamp >= 0,
@@ -804,7 +816,7 @@ shaka.hls.HlsParser = class {
       const PresentationType = shaka.hls.HlsParser.PresentationType_;
 
       if (this.presentationType_ == PresentationType.LIVE) {
-        let segmentAvailabilityDuration = this.getMinDuration_();
+        let segmentAvailabilityDuration = this.getLiveDuration_();
 
         // This defaults to the presentation delay, which has the effect of
         // making the live stream unseekable.  This is consistent with Apple's
@@ -1655,6 +1667,7 @@ shaka.hls.HlsParser = class {
       verbatimMediaPlaylistUri,
       // These values are filled out or updated after lazy-loading:
       absoluteMediaPlaylistUri: initialMediaPlaylistUri,
+      minTimestamp: 0,
       maxTimestamp: 0,
       mediaSequenceToStartTime: new Map(),
       canSkipSegments: false,
@@ -1700,6 +1713,7 @@ shaka.hls.HlsParser = class {
 
       // Copy values from the real stream info to our initial one.
       streamInfo.absoluteMediaPlaylistUri = absoluteMediaPlaylistUri;
+      streamInfo.minTimestamp = realStreamInfo.minTimestamp;
       streamInfo.maxTimestamp = realStreamInfo.maxTimestamp;
       streamInfo.canSkipSegments = realStreamInfo.canSkipSegments;
       streamInfo.hasEndList = realStreamInfo.hasEndList;
@@ -1833,6 +1847,22 @@ shaka.hls.HlsParser = class {
     return minDuration;
   }
 
+  /**
+   * @return {number}
+   * @private
+   */
+  getLiveDuration_() {
+    let maxTimestamp = Infinity;
+    let minTimestamp = Infinity;
+    for (const streamInfo of this.uriToStreamInfosMap_.values()) {
+      if (streamInfo.stream.segmentIndex && streamInfo.stream.type != 'text') {
+        maxTimestamp = Math.min(maxTimestamp, streamInfo.maxTimestamp);
+        minTimestamp = Math.min(minTimestamp, streamInfo.minTimestamp);
+      }
+    }
+    return maxTimestamp - minTimestamp;
+  }
+
   /**
    * @param {!Array.<!shaka.extern.Stream>} streams
    * @private
@@ -1978,6 +2008,7 @@ shaka.hls.HlsParser = class {
       this.determinePresentationType_(playlist);
     }
 
+    const firstStartTime = segments[0].startTime;
     const lastEndTime = segments[segments.length - 1].endTime;
     /** @type {!shaka.media.SegmentIndex} */
     const segmentIndex = new shaka.media.SegmentIndex(segments);
@@ -2000,6 +2031,7 @@ shaka.hls.HlsParser = class {
       type,
       verbatimMediaPlaylistUri,
       absoluteMediaPlaylistUri,
+      minTimestamp: firstStartTime,
       maxTimestamp: lastEndTime,
       canSkipSegments,
       hasEndList: false,
@@ -2498,6 +2530,9 @@ shaka.hls.HlsParser = class {
             /* tileDuration= */ null,
             /* syncTime= */ null,
             partialStatus);
+        if (item.name == 'EXT-X-PRELOAD-HINT') {
+          partial.markAsPreload();
+        }
         partialSegmentRefs.push(partial);
       } // for-loop of hlsSegment.partialSegments
     }
@@ -2807,6 +2842,9 @@ shaka.hls.HlsParser = class {
    * @private
    */
   variableSubstitution_(uri, variables) {
+    if (!variables.size) {
+      return uri;
+    }
     let newUri = String(uri).replace(/%7B/g, '{').replace(/%7D/g, '}');
 
     const uriVariables = newUri.match(/{\$\w*}/g);
@@ -3252,6 +3290,7 @@ shaka.hls.HlsParser = class {
  *   type: string,
  *   verbatimMediaPlaylistUri: string,
  *   absoluteMediaPlaylistUri: string,
+ *   minTimestamp: number,
  *   maxTimestamp: number,
  *   mediaSequenceToStartTime: !Map.<number, number>,
  *   canSkipSegments: boolean,
@@ -3275,6 +3314,8 @@ shaka.hls.HlsParser = class {
  * @property {string} absoluteMediaPlaylistUri
  *   The absolute media playlist URI, resolved relative to the master playlist
  *   and updated to reflect any redirects.
+ * @property {number} minTimestamp
+ *   The minimum timestamp found in the stream.
  * @property {number} maxTimestamp
  *   The maximum timestamp found in the stream.
  * @property {!Map.<number, number>} mediaSequenceToStartTime

package/lib/hls/manifest_text_parser.js

@@ -158,7 +158,15 @@ shaka.hls.ManifestTextParser = class {
             partialSegmentTags.push(tag);
           } else if (tag.name == 'EXT-X-PRELOAD-HINT') {
             if (tag.getAttributeValue('TYPE') == 'PART') {
-              partialSegmentTags.push(tag);
+              // Note: BYTERANGE-START without BYTERANGE-LENGTH is being
+              // ignored.
+              if (tag.getAttributeValue('BYTERANGE-START') != null) {
+                if (tag.getAttributeValue('BYTERANGE-LENGTH') != null) {
+                  partialSegmentTags.push(tag);
+                }
+              } else {
+                partialSegmentTags.push(tag);
+              }
             } else if (tag.getAttributeValue('TYPE') == 'MAP') {
               // Rename the Preload Hint tag to be a Map tag.
               tag.setName('EXT-X-MAP');
@@ -300,6 +308,7 @@ shaka.hls.ManifestTextParser.MEDIA_PLAYLIST_TAGS = [
   'EXT-X-ENDLIST',
   'EXT-X-SERVER-CONTROL',
   'EXT-X-SKIP',
+  'EXT-X-PART-INF',
 ];
 
 

package/lib/media/drm_engine.js

@@ -133,6 +133,9 @@ shaka.media.DrmEngine = class {
 
     /** @private {Promise} */
     this.mediaKeysAttached_ = null;
+
+    /** @private {?shaka.extern.InitDataOverride} */
+    this.manifestInitData_ = null;
   }
 
   /** @override */
@@ -480,10 +483,10 @@ shaka.media.DrmEngine = class {
           () => this.closeOpenSessions_());
     }
 
-    const manifestInitData = this.currentDrmInfo_ ?
-      this.currentDrmInfo_.initData.find(
+    this.manifestInitData_ = this.currentDrmInfo_ ?
+      (this.currentDrmInfo_.initData.find(
           (initDataOverride) => initDataOverride.initData.length > 0,
-      ) : null;
+      ) || null) : null;
 
     /**
      * We can attach media keys before the playback actually begins when:
@@ -491,7 +494,7 @@ shaka.media.DrmEngine = class {
      *  - Some initData already has been generated (through the manifest)
      *  - In case of an offline session
      */
-    if (manifestInitData ||
+    if (this.manifestInitData_ ||
         this.currentDrmInfo_.keySystem !== 'com.apple.fps' ||
         this.offlineSessionIds_.length) {
       await this.attachMediaKeys_();
@@ -504,7 +507,7 @@ shaka.media.DrmEngine = class {
     // Also suppress 'encrypted' events when parsing in-band ppsh
     // from media segments because that serves the same purpose as the
     // 'encrypted' events.
-    if (!manifestInitData && !this.offlineSessionIds_.length &&
+    if (!this.manifestInitData_ && !this.offlineSessionIds_.length &&
         !this.config_.parseInbandPsshEnabled) {
       this.eventManager_.listen(
           this.video_, 'encrypted', (e) => this.onEncryptedEvent_(e));
@@ -2361,7 +2364,7 @@ shaka.media.DrmEngine = class {
    * @return {!Promise<void>}
    */
   parseInbandPssh(contentType, mediaSegment) {
-    if (!this.config_.parseInbandPsshEnabled) {
+    if (!this.config_.parseInbandPsshEnabled || this.manifestInitData_) {
       return Promise.resolve();
     }
 

package/lib/media/media_source_engine.js

@@ -109,15 +109,15 @@ shaka.media.MediaSourceEngine = class {
     /** @private {!shaka.util.PublicPromise} */
     this.mediaSourceOpen_ = new shaka.util.PublicPromise();
 
+    /** @private {string} */
+    this.url_ = '';
+
     /** @private {MediaSource} */
     this.mediaSource_ = this.createMediaSource(this.mediaSourceOpen_);
 
     /** @type {!shaka.util.Destroyer} */
     this.destroyer_ = new shaka.util.Destroyer(() => this.doDestroy_());
 
-    /** @private {string} */
-    this.url_ = '';
-
     /** @private {boolean} */
     this.sequenceMode_ = false;
 
@@ -154,6 +154,8 @@ shaka.media.MediaSourceEngine = class {
    * @private
    */
   onSourceOpen_(p) {
+    goog.asserts.assert(this.url_, 'Must have object URL');
+
     // Release the object URL that was previously created, to prevent memory
     // leak.
     // createObjectURL creates a strong reference to the MediaSource object
@@ -791,7 +793,7 @@ shaka.media.MediaSourceEngine = class {
       this.append_(contentType, data);
     });
 
-    if (goog.DEBUG && reference) {
+    if (goog.DEBUG && reference && !reference.isPreload()) {
       const bufferedAfter = this.getBuffered_(contentType);
       const newBuffered = shaka.media.TimeRangesUtils.computeAddedRange(
           bufferedBefore, bufferedAfter);

package/lib/media/segment_reference.js

@@ -243,6 +243,9 @@ shaka.media.SegmentReference = class {
     /** @type {shaka.media.SegmentReference.Status} */
     this.status = status;
 
+    /** @type {boolean} */
+    this.preload = false;
+
     /** @type {?shaka.extern.HlsAes128Key} */
     this.hlsAes128Key = hlsAes128Key;
 
@@ -366,6 +369,25 @@ shaka.media.SegmentReference = class {
     this.status = shaka.media.SegmentReference.Status.UNAVAILABLE;
   }
 
+  /**
+   * Mark the reference as preload.
+   *
+   * @export
+   */
+  markAsPreload() {
+    this.preload = true;
+  }
+
+  /**
+   * Returns true if the segment is preloaded.
+   *
+   * @return {boolean}
+   * @export
+   */
+  isPreload() {
+    return this.preload;
+  }
+
   /**
    * Set the segment's thumbnail sprite.
    *

package/lib/media/streaming_engine.js

@@ -651,10 +651,15 @@ shaka.media.StreamingEngine = class {
       const mediaState = this.mediaStates_.get(type);
       const logPrefix = shaka.media.StreamingEngine.logPrefix_(mediaState);
 
-      // Always clear the iterator since we need to start streaming from the
-      // new time.  This also happens in clearBuffer_, but if we don't clear,
-      // we still want to reset the iterator.
-      mediaState.segmentIterator = null;
+      let segment = null;
+      if (mediaState.segmentIterator) {
+        segment = mediaState.segmentIterator.current();
+      }
+      // Only reset the iterator if we seek outside the current segment.
+      if (!segment || segment.startTime > presentationTime ||
+          segment.endTime < presentationTime) {
+        mediaState.segmentIterator = null;
+      }
 
       if (!newTimeIsBuffered(type)) {
         const bufferEnd =

package/lib/player.js

@@ -6066,6 +6066,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       error.category != shaka.util.Error.Category.NETWORK) {
       return false;
     }
+    if (this.loadMode_ != shaka.Player.LoadMode.MEDIA_SOURCE) {
+      return false;
+    }
+    goog.asserts.assert(this.manifest_, 'Should have manifest!');
 
     if (!navigator.onLine) {
       // Don't restrict variants if we're completely offline, or else we end up
@@ -7005,7 +7009,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v4.3.6-uncompiled';
+shaka.Player.version = 'v4.3.7-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.3.6",
+  "version": "4.3.7",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -18,6 +18,7 @@
     "awesomplete": "^1.1.5",
     "babel-plugin-istanbul": "^6.1.1",
     "cajon": "^0.4.4",
+    "clean-package": "^2.2.0",
     "code-prettify": "^0.1.0",
     "color-themes-for-google-code-prettify": "^2.0.4",
     "core-js": "^3.21.1",
@@ -94,12 +95,16 @@
   },
   "license": "Apache-2.0",
   "scripts": {
+    "prepack": "clean-package",
+    "postpack": "clean-package restore",
     "prepublishOnly": "python build/checkversion.py && python build/all.py --force"
   },
   "dependencies": {
     "eme-encryption-scheme-polyfill": "^2.1.1"
   },
-  "engines": {
-    "node": ">=14"
+  "clean-package": {
+    "remove": [
+      "engines"
+    ]
   }
 }

package/test/cea/mp4_cea_parser_unit.js

@@ -7,20 +7,30 @@
 describe('Mp4CeaParser', () => {
   const ceaInitSegmentUri = '/base/test/test/assets/cea-init.mp4';
   const ceaSegmentUri = '/base/test/test/assets/cea-segment.mp4';
+  const h265ceaInitSegmentUri = '/base/test/test/assets/h265-cea-init.mp4';
+  const h265ceaSegmentUri = '/base/test/test/assets/h265-cea-segment.mp4';
   const Util = shaka.test.Util;
 
   /** @type {!ArrayBuffer} */
   let ceaInitSegment;
   /** @type {!ArrayBuffer} */
   let ceaSegment;
+  /** @type {!ArrayBuffer} */
+  let h265ceaInitSegment;
+  /** @type {!ArrayBuffer} */
+  let h265ceaSegment;
 
   beforeAll(async () => {
     const responses = await Promise.all([
       shaka.test.Util.fetch(ceaInitSegmentUri),
       shaka.test.Util.fetch(ceaSegmentUri),
+      shaka.test.Util.fetch(h265ceaInitSegmentUri),
+      shaka.test.Util.fetch(h265ceaSegmentUri),
     ]);
     ceaInitSegment = responses[0];
     ceaSegment = responses[1];
+    h265ceaInitSegment = responses[2];
+    h265ceaSegment = responses[3];
   });
 
   /**
@@ -70,6 +80,15 @@ describe('Mp4CeaParser', () => {
         .toEqual(expectedCea708Packet);
   });
 
+  it('parses cea data from an h265 mp4 stream', () => {
+    const ceaParser = new shaka.cea.Mp4CeaParser();
+
+    ceaParser.init(h265ceaInitSegment);
+    const ceaPackets = ceaParser.parse(h265ceaSegment);
+    expect(ceaPackets).toBeDefined();
+    expect(ceaPackets.length).toBe(60);
+  });
+
   it('parses an invalid init segment', () => {
     const cea708Parser = new shaka.cea.Mp4CeaParser();
 

package/test/hls/hls_live_unit.js

@@ -590,7 +590,8 @@ describe('HlsParser live', () => {
         // partialRef3
         '#EXT-X-PART:DURATION=2,URI="partial.mp4",BYTERANGE=210@0\n',
         // preloadRef
-        '#EXT-X-PRELOAD-HINT:TYPE=PART,URI="partial.mp4",BYTERANGE-START=210\n',
+        '#EXT-X-PRELOAD-HINT:TYPE=PART,URI="partial.mp4",BYTERANGE-START=210,',
+        'BYTERANGE-LENGTH=210\n',
       ].join('');
 
       const partialRef = makeReference(
@@ -613,6 +614,7 @@ describe('HlsParser live', () => {
       const preloadRef = makeReference(
           'test:/partial.mp4', 6, 7.5, /* syncTime= */ null,
           /* baseUri= */ '', /* startByte= */ 210, /* endByte= */ null);
+      preloadRef.markAsPreload();
 
       // ref2 is not fully published yet, so it doesn't have a segment uri.
       const ref2 = makeReference(

package/test/media/media_source_engine_unit.js

@@ -171,9 +171,12 @@ describe('MediaSourceEngine', () => {
   describe('constructor', () => {
     const originalCreateObjectURL =
       shaka.media.MediaSourceEngine.createObjectURL;
+    const originalRevokeObjectURL = window.URL.revokeObjectURL;
     const originalMediaSource = window.MediaSource;
     /** @type {jasmine.Spy} */
     let createObjectURLSpy;
+    /** @type {jasmine.Spy} */
+    let revokeObjectURLSpy;
 
     beforeEach(async () => {
       // Mock out MediaSource so we can test the production version of
@@ -188,6 +191,9 @@ describe('MediaSourceEngine', () => {
       shaka.media.MediaSourceEngine.createObjectURL =
         Util.spyFunc(createObjectURLSpy);
 
+      revokeObjectURLSpy = jasmine.createSpy('revokeObjectURL');
+      window.URL.revokeObjectURL = Util.spyFunc(revokeObjectURLSpy);
+
       const mediaSourceSpy = jasmine.createSpy('MediaSource');
       // Because this is a fake constructor, it must be callable with "new".
       // This will cause jasmine to invoke the callback with "new" as well, so
@@ -205,6 +211,7 @@ describe('MediaSourceEngine', () => {
     afterAll(() => {
       shaka.media.MediaSourceEngine.createObjectURL = originalCreateObjectURL;
       window.MediaSource = originalMediaSource;
+      window.URL.revokeObjectURL = originalRevokeObjectURL;
     });
 
     it('creates a MediaSource object and sets video.src', () => {
@@ -216,6 +223,29 @@ describe('MediaSourceEngine', () => {
       expect(createObjectURLSpy).toHaveBeenCalled();
       expect(mockVideo.src).toBe('blob:foo');
     });
+
+    it('revokes object URL after MediaSource opens', () => {
+      let onSourceOpenListener;
+
+      mockMediaSource.addEventListener.and.callFake((event, callback, _) => {
+        if (event == 'sourceopen') {
+          onSourceOpenListener = callback;
+        }
+      });
+
+      mediaSourceEngine = new shaka.media.MediaSourceEngine(
+          video,
+          new shaka.test.FakeTextDisplayer());
+
+      expect(mockMediaSource.addEventListener).toHaveBeenCalledTimes(1);
+      expect(mockMediaSource.addEventListener.calls.mostRecent().args[0])
+          .toBe('sourceopen');
+      expect(typeof onSourceOpenListener).toBe(typeof Function);
+
+      onSourceOpenListener();
+
+      expect(revokeObjectURLSpy).toHaveBeenCalledWith('blob:foo');
+    });
   });
 
   describe('init', () => {

package/test/test/util/layout_tests.js

@@ -43,9 +43,10 @@ shaka.test.LayoutTests = class {
       });
     });
 
-    // Wait one extra tick to make sure the font rendering on the page has been
-    // updated.  Without this, we saw some rare test flake in Firefox on Mac.
-    await shaka.test.Util.shortDelay();
+    // Wait one extra second to make sure the font rendering on the page has
+    // been updated.  Without this, we saw some rare test flake in Firefox on
+    // Mac.
+    await shaka.test.Util.delay(1);
   }
 
   /**