shaka-player 4.8.11 → 4.8.13

package/externs/polyfill.js

@@ -11,5 +11,5 @@
  */
 
 
-/** @type {boolean} */
+/** @type {string} */
 window.shakaMediaKeysPolyfill;

package/lib/abr/simple_abr_manager.js

@@ -268,7 +268,8 @@ shaka.abr.SimpleAbrManager = class {
 
       if (currentBandwidth >= minBandwidth &&
           currentBandwidth <= maxBandwidth &&
-          chosen.bandwidth != item.bandwidth) {
+          (chosen.bandwidth != item.bandwidth ||
+          this.isSameBandwidthAndHigherResolution_(chosen, item))) {
         chosen = item;
       }
     }
@@ -532,6 +533,23 @@ shaka.abr.SimpleAbrManager = class {
       return v1.width - v2.width;
     });
   }
+
+  /**
+   * @param {shaka.extern.Variant} chosenVariant
+   * @param {shaka.extern.Variant} newVariant
+   * @return {boolean}
+   * @private
+   */
+  isSameBandwidthAndHigherResolution_(chosenVariant, newVariant) {
+    if (chosenVariant.bandwidth != newVariant.bandwidth) {
+      return false;
+    }
+    if (!chosenVariant.video || !newVariant.video) {
+      return false;
+    }
+    return chosenVariant.video.width < newVariant.video.width ||
+        chosenVariant.video.height < newVariant.video.height;
+  }
 };
 
 

package/lib/hls/hls_parser.js

@@ -486,7 +486,7 @@ shaka.hls.HlsParser = class {
           mediaSequenceNumber);
       stream.segmentIndex.evict(playlistStartTime);
     }
-    const oldSegment = segments[0];
+    const oldSegment = stream.segmentIndex.earliestReference();
     goog.asserts.assert(oldSegment, 'Should have segments!');
 
     streamInfo.minTimestamp = oldSegment.startTime;
@@ -4224,7 +4224,7 @@ shaka.hls.HlsParser = class {
     }
 
     const uri = drmTag.getRequiredAttrValue('URI');
-    const parsedData = shaka.net.DataUriPlugin.parseRaw(uri);
+    const parsedData = shaka.net.DataUriPlugin.parseRaw(uri.split('?')[0]);
 
     // The data encoded in the URI is a PSSH box to be used as init data.
     const pssh = shaka.util.BufferUtils.toUint8(parsedData.data);
@@ -4267,7 +4267,7 @@ shaka.hls.HlsParser = class {
     }
 
     const uri = drmTag.getRequiredAttrValue('URI');
-    const parsedData = shaka.net.DataUriPlugin.parseRaw(uri);
+    const parsedData = shaka.net.DataUriPlugin.parseRaw(uri.split('?')[0]);
 
     // The data encoded in the URI is a PlayReady Pro Object, so we need
     // convert it to pssh.

package/lib/media/drm_engine.js

@@ -177,12 +177,18 @@ shaka.media.DrmEngine = class {
 
     // |video_| will be |null| if we never attached to a video element.
     if (this.video_) {
-      goog.asserts.assert(!this.video_.src, 'video src must be removed first!');
+      // Webkit EME implementation requires the src to be defined to clear
+      // the MediaKeys.
+      if (!shaka.util.Platform.isMediaKeysPolyfilled('webkit')) {
+        goog.asserts.assert(!this.video_.src,
+            'video src must be removed first!');
+      }
 
       try {
         await this.video_.setMediaKeys(null);
       } catch (error) {
         // Ignore any failures while removing media keys from the video element.
+        shaka.log.debug(`DrmEngine.destroyNow_ exception`, error);
       }
 
       this.video_ = null;

package/lib/media/media_source_engine.js

@@ -316,7 +316,7 @@ shaka.media.MediaSourceEngine = class {
       'audio/mp4; codecs="mp4a.40.2"',
       'audio/mp4; codecs="ac-3"',
       'audio/mp4; codecs="ec-3"',
-      'audio/mp4; codecs="ac-4"',
+      'audio/mp4; codecs="ac-4.02.01.01"',
       'audio/mp4; codecs="opus"',
       'audio/mp4; codecs="flac"',
       'audio/mp4; codecs="dtsc"', // DTS Digital Surround

package/lib/media/presentation_timeline.js

@@ -98,7 +98,7 @@ shaka.media.PresentationTimeline = class {
     this.startTimeLocked_ = false;
 
     /** @private {?number} */
-    this.initialProgramDateTime_ = null;
+    this.initialProgramDateTime_ = presentationStartTime;
   }
 
 

package/lib/player.js

@@ -828,21 +828,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    */
   setupLcevc_(config) {
     if (config.lcevc.enabled) {
-      const tracks = this.getVariantTracks();
-      if (tracks && tracks[0] && tracks[0].videoMimeType == 'video/mp2t') {
-        const edge = shaka.util.Platform.isEdge() ||
-          shaka.util.Platform.isLegacyEdge();
-        if (edge) {
-          if (!config.mediaSource.forceTransmux) {
-            // If forceTransmux is disabled for Microsoft Edge, LCEVC data
-            // is stripped out in case of a MPEG-2 TS container.
-            // Hence the warning for Microsoft Edge when playing content with
-            // MPEG-2 TS container.
-            shaka.log.alwaysWarn('LCEVC Warning: For MPEG-2 TS decoding '+
-            'the config.mediaSource.forceTransmux must be enabled.');
-          }
-        }
-      }
       this.closeLcevcDec_();
       this.createLcevcDec_(config.lcevc);
     } else {
@@ -1289,6 +1274,13 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         this.playhead_ = null;
       }
 
+      // EME v0.1b requires the media element to clear the MediaKeys
+      if (shaka.util.Platform.isMediaKeysPolyfilled('webkit') &&
+          this.drmEngine_) {
+        await this.drmEngine_.destroy();
+        this.drmEngine_ = null;
+      }
+
       // Media source engine holds onto the media element, and in order to
       // detach the media keys (with drm engine), we need to break the
       // connection between media source engine and the media element.
@@ -7248,7 +7240,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.8.11' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.8.13' + '-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

@@ -76,7 +76,7 @@ shaka.polyfill.PatchedMediaKeysApple = class {
     navigator.requestMediaKeySystemAccess =
         PatchedMediaKeysApple.requestMediaKeySystemAccess;
 
-    window.shakaMediaKeysPolyfill = true;
+    window.shakaMediaKeysPolyfill = PatchedMediaKeysApple.apiName_;
   }
 
   /**
@@ -115,7 +115,7 @@ shaka.polyfill.PatchedMediaKeysApple = class {
     PatchedMediaKeysApple.originalNavigatorRequestMediaKeySystemAccess = null;
     PatchedMediaKeysApple.originalHTMLMediaElementPrototypeMediaKeys = null;
 
-    window.shakaMediaKeysPolyfill = false;
+    window.shakaMediaKeysPolyfill = '';
   }
 
   /**
@@ -791,3 +791,10 @@ shaka.polyfill.PatchedMediaKeysApple.MediaKeyStatusMap = class {
     goog.asserts.assert(false, 'Not used!  Provided only for the compiler.');
   }
 };
+
+/**
+ * API name.
+ *
+ * @private {string}
+ */
+shaka.polyfill.PatchedMediaKeysApple.apiName_ = 'apple';

package/lib/polyfill/patchedmediakeys_nop.js

@@ -50,7 +50,7 @@ shaka.polyfill.PatchedMediaKeysNop = class {
     window.MediaKeys = PatchedMediaKeysNop.MediaKeys;
     window.MediaKeySystemAccess = PatchedMediaKeysNop.MediaKeySystemAccess;
 
-    window.shakaMediaKeysPolyfill = true;
+    window.shakaMediaKeysPolyfill = PatchedMediaKeysNop.apiName_;
   }
 
   /**
@@ -136,6 +136,13 @@ shaka.polyfill.PatchedMediaKeysNop.MediaKeySystemAccess = class {
   createMediaKeys() {}
 };
 
+/**
+ * API name.
+ *
+ * @private {string}
+ */
+shaka.polyfill.PatchedMediaKeysNop.apiName_ = 'nop';
+
 
 // A low priority ensures this is the last and acts as a fallback.
 shaka.polyfill.register(shaka.polyfill.PatchedMediaKeysNop.install, -10);

package/lib/polyfill/patchedmediakeys_webkit.js

@@ -73,7 +73,7 @@ shaka.polyfill.PatchedMediaKeysWebkit = class {
     window.MediaKeys = PatchedMediaKeysWebkit.MediaKeys;
     window.MediaKeySystemAccess = PatchedMediaKeysWebkit.MediaKeySystemAccess;
 
-    window.shakaMediaKeysPolyfill = true;
+    window.shakaMediaKeysPolyfill = PatchedMediaKeysWebkit.apiName_;
   }
 
   /**
@@ -860,7 +860,9 @@ class extends shaka.util.FakeEventTarget {
           PatchedMediaKeysWebkit.prefixApi_('cancelKeyRequest');
       try {
         this.media_[cancelKeyRequestName](this.keySystem_, this.sessionId);
-      } catch (exception) {}
+      } catch (exception) {
+        shaka.log.debug(`${cancelKeyRequestName} exception`, exception);
+      }
     }
 
     // Resolve the 'closed' promise and return it.
@@ -977,4 +979,12 @@ shaka.polyfill.PatchedMediaKeysWebkit.MediaKeyStatusMap = class {
 shaka.polyfill.PatchedMediaKeysWebkit.prefix_ = '';
 
 
+/**
+ * API name.
+ *
+ * @private {string}
+ */
+shaka.polyfill.PatchedMediaKeysWebkit.apiName_ = 'webkit';
+
+
 shaka.polyfill.register(shaka.polyfill.PatchedMediaKeysWebkit.install);

package/lib/util/platform.js

@@ -644,16 +644,17 @@ shaka.util.Platform = class {
   /**
    * Returns true if MediaKeys is polyfilled
    *
+   * @param {string=} polyfillType
    * @return {boolean}
    */
-  static isMediaKeysPolyfilled() {
-    if (window.shakaMediaKeysPolyfill) {
-      return true;
+  static isMediaKeysPolyfilled(polyfillType) {
+    if (polyfillType) {
+      return polyfillType === window.shakaMediaKeysPolyfill;
     }
-
-    return false;
+    return !!window.shakaMediaKeysPolyfill;
   }
 
+
   /**
    * Detect the maximum resolution that the platform's hardware can handle.
    *

package/package.json

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