shaka-player 4.6.4 → 4.6.5

package/lib/media/media_source_engine.js

@@ -864,7 +864,7 @@ shaka.media.MediaSourceEngine = class {
         const calculatedTimestampOffset = reference.startTime - timestamp;
         const timestampOffsetDifference =
             Math.abs(timestampOffset - calculatedTimestampOffset);
-        if ((timestampOffsetDifference >= 0.1 || seeked || adaptation) &&
+        if ((timestampOffsetDifference >= 0.001 || seeked || adaptation) &&
             (!isChunkedData || calculatedTimestampOffset > 0 ||
             !timestampOffset)) {
           timestampOffset = calculatedTimestampOffset;

package/lib/net/networking_utils.js

@@ -8,6 +8,7 @@ goog.provide('shaka.net.NetworkingUtils');
 
 goog.require('goog.Uri');
 goog.require('shaka.net.NetworkingEngine');
+goog.require('shaka.util.Error');
 
 
 /**
@@ -30,13 +31,21 @@ shaka.net.NetworkingUtils = class {
     const type = shaka.net.NetworkingEngine.RequestType.MANIFEST;
 
     const request = shaka.net.NetworkingEngine.makeRequest([uri], retryParams);
-    request.method = 'HEAD';
 
-    const response = await netEngine.request(type, request).promise;
+    try {
+      request.method = 'HEAD';
+      const response = await netEngine.request(type, request).promise;
+      mimeType = response.headers['content-type'];
+    } catch (error) {
+      if (error && error.code == shaka.util.Error.Code.HTTP_ERROR) {
+        request.method = 'GET';
+        const response = await netEngine.request(type, request).promise;
+        mimeType = response.headers['content-type'];
+      }
+    }
 
     // https://bit.ly/2K9s9kf says this header should always be available,
     // but just to be safe:
-    mimeType = response.headers['content-type'];
     return mimeType ? mimeType.toLowerCase().split(';').shift() : '';
   }
 

package/lib/player.js

@@ -4525,7 +4525,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
       if (this.isLive()) {
         const now = this.getPresentationStartTimeAsDate().valueOf() +
-            this.seekRange().end * 1000;
+            element.currentTime * 1000;
         const latency = (Date.now() - now) / 1000;
         this.stats_.setLiveLatency(latency);
       }
@@ -6779,7 +6779,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.6.4' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.6.5' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/util/ts_parser.js

@@ -614,9 +614,11 @@ shaka.util.TsParser = class {
       let sort = false;
       for (const audioData of this.audioData_) {
         const pes = this.parsePES_(audioData);
-        if (pes && pes.pts != null && pes.dts != null) {
-          if (this.audioPes_.length &&
-              pes.dts < (this.audioPes_[this.audioPes_.length - 1].dts || 0)) {
+        let previousPes = this.audioPes_.length ?
+            this.audioPes_[this.audioPes_.length - 1] : null;
+        if (pes && pes.pts != null && pes.dts != null && (!previousPes ||
+            (previousPes.pts != pes.pts && previousPes.dts != pes.dts))) {
+          if (this.audioPes_.length && pes.dts < (previousPes.dts || 0)) {
             sort = true;
           }
           this.audioPes_.push(pes);
@@ -625,7 +627,7 @@ shaka.util.TsParser = class {
           if (!data) {
             continue;
           }
-          const previousPes = this.audioPes_.pop();
+          previousPes = this.audioPes_.pop();
           previousPes.data =
               shaka.util.Uint8ArrayUtils.concat(previousPes.data, data);
           this.audioPes_.push(previousPes);
@@ -654,9 +656,11 @@ shaka.util.TsParser = class {
       let sort = false;
       for (const videoData of this.videoData_) {
         const pes = this.parsePES_(videoData);
-        if (pes && pes.pts != null && pes.dts != null) {
-          if (this.videoPes_.length &&
-              pes.dts < (this.videoPes_[this.videoPes_.length - 1].dts || 0)) {
+        let previousPes = this.videoPes_.length ?
+            this.videoPes_[this.videoPes_.length - 1] : null;
+        if (pes && pes.pts != null && pes.dts != null && (!previousPes ||
+            (previousPes.pts != pes.pts && previousPes.dts != pes.dts))) {
+          if (this.videoPes_.length && pes.dts < (previousPes.dts || 0)) {
             sort = true;
           }
           this.videoPes_.push(pes);
@@ -665,7 +669,7 @@ shaka.util.TsParser = class {
           if (!data) {
             continue;
           }
-          const previousPes = this.videoPes_.pop();
+          previousPes = this.videoPes_.pop();
           previousPes.data =
               shaka.util.Uint8ArrayUtils.concat(previousPes.data, data);
           this.videoPes_.push(previousPes);

package/package.json

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

package/test/player_unit.js

@@ -3484,6 +3484,37 @@ describe('Player', () => {
       expect(tracks[0].id).toBe(2);
     });
 
+    it('removes based on frameRate', async () => {
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        manifest.addVariant(0, (variant) => {
+          variant.addVideo(1, (stream) => {
+            stream.frameRate = 15;
+          });
+        });
+
+        manifest.addVariant(1, (variant) => {
+          variant.addVideo(2, (stream) => {
+            stream.frameRate = 30;
+          });
+        });
+
+        manifest.addVariant(2, (variant) => {
+          variant.addVideo(3, (stream) => {
+            stream.frameRate = 60;
+          });
+        });
+      });
+
+      await player.load(fakeManifestUri, 0, fakeMimeType);
+      expect(player.getVariantTracks().length).toBe(3);
+
+      player.configure({restrictions: {minFrameRate: 20, maxFrameRate: 40}});
+
+      const tracks = player.getVariantTracks();
+      expect(tracks.length).toBe(1);
+      expect(tracks[0].id).toBe(1);
+    });
+
     it('removes the whole variant if one stream is restricted', async () => {
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(0, (variant) => {

package/ui/volume_bar.js

@@ -32,6 +32,10 @@ shaka.ui.VolumeBar = class extends shaka.ui.RangeElement {
     /** @private {!shaka.extern.UIConfiguration} */
     this.config_ = this.controls.getConfig();
 
+    // We use a range of 100 to avoid problems with Firefox.
+    // See https://github.com/shaka-project/shaka-player/issues/3987
+    this.setRange(0, 100);
+
     this.eventManager.listen(this.video,
         'volumechange',
         () => this.onPresentationVolumeChange_());
@@ -74,9 +78,9 @@ shaka.ui.VolumeBar = class extends shaka.ui.RangeElement {
    */
   onChange() {
     if (this.ad && this.ad.isLinear()) {
-      this.ad.setVolume(this.getValue());
+      this.ad.setVolume(this.getValue() / 100);
     } else {
-      this.video.volume = this.getValue();
+      this.video.volume = this.getValue() / 100;
       if (this.video.volume == 0) {
         this.video.muted = true;
       } else {
@@ -90,7 +94,7 @@ shaka.ui.VolumeBar = class extends shaka.ui.RangeElement {
     if (this.video.muted) {
       this.setValue(0);
     } else {
-      this.setValue(this.video.volume);
+      this.setValue(this.video.volume * 100);
     }
 
     this.updateColors_();
@@ -102,7 +106,7 @@ shaka.ui.VolumeBar = class extends shaka.ui.RangeElement {
         'This.ad should exist at this point!');
 
     const volume = this.ad.getVolume();
-    this.setValue(volume);
+    this.setValue(volume * 100);
     this.updateColors_();
   }
 
@@ -110,8 +114,8 @@ shaka.ui.VolumeBar = class extends shaka.ui.RangeElement {
   updateColors_() {
     const colors = this.config_.volumeBarColors;
     const gradient = ['to right'];
-    gradient.push(colors.level + (this.getValue() * 100) + '%');
-    gradient.push(colors.base + (this.getValue() * 100) + '%');
+    gradient.push(colors.level + this.getValue() + '%');
+    gradient.push(colors.base + this.getValue() + '%');
     gradient.push(colors.base + '100%');
 
     this.container.style.background =