shaka-player 4.2.10 → 4.2.11

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/hls/hls_parser.js

@@ -2131,6 +2131,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
     }
@@ -2451,6 +2454,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);

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));
@@ -2353,7 +2356,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

@@ -99,15 +99,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;
 
@@ -144,6 +144,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
@@ -710,7 +712,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

@@ -238,6 +238,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;
 
@@ -358,6 +361,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;
+  }
+
   /**
    * Offset the segment reference by a fixed amount.
    *

package/lib/media/streaming_engine.js

@@ -640,10 +640,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

@@ -5686,6 +5686,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
@@ -6626,7 +6630,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v4.2.10-uncompiled';
+shaka.Player.version = 'v4.2.11-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.2.10",
+  "version": "4.2.11",
   "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",
@@ -66,6 +67,7 @@
     "demoDeps": [
       "awesomplete/awesomplete.css",
       "awesomplete/awesomplete.min.js",
+      "codem-isoboxer/dist/iso_boxer.min.js",
       "dialog-polyfill/dialog-polyfill.css",
       "dialog-polyfill/dist/dialog-polyfill.js",
       "eme-encryption-scheme-polyfill/index.js",
@@ -91,12 +93,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/hls/hls_live_unit.js

@@ -560,7 +560,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(
@@ -583,6 +584,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

@@ -165,9 +165,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
@@ -182,6 +185,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
@@ -199,6 +205,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', () => {
@@ -211,6 +218,30 @@ 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.FakeClosedCaptionParser(),
+          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);
   }
 
   /**