shaka-player 4.9.2 → 4.9.3

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;
       }
     }
@@ -537,6 +538,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

@@ -489,7 +489,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;
@@ -4282,7 +4282,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);
@@ -4325,7 +4325,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/player.js

@@ -7454,7 +7454,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.9.2' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.9.3' + '-uncompiled';  // x-release-please-version
 
 // 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.9.2",
+  "version": "4.9.3",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [