shaka-player 4.6.6 → 4.6.7

package/lib/ads/client_side_ad.js

@@ -207,6 +207,15 @@ shaka.ads.ClientSideAd = class {
     }
   }
 
+  /**
+   * It's required for a muted ad to start when autoplaying.
+   *
+   * @param {number} videoVolume
+   */
+  setInitialMuted(videoVolume) {
+    this.volume_ = videoVolume;
+    this.manager_.setVolume(0);
+  }
 
   /**
    * @override

package/lib/ads/client_side_ad_manager.js

@@ -532,9 +532,10 @@ shaka.ads.ClientSideAdManager = class {
     if (this.ad_.isLinear()) {
       this.adContainer_.setAttribute('ad-active', 'true');
       this.video_.pause();
-      this.ad_.setVolume(this.video_.volume);
       if (this.video_.muted) {
-        this.ad_.setMuted(true);
+        this.ad_.setInitialMuted(this.video_.volume);
+      } else {
+        this.ad_.setVolume(this.video_.volume);
       }
     }
   }

package/lib/hls/hls_parser.js

@@ -3452,6 +3452,13 @@ shaka.hls.HlsParser = class {
     if (this.isLive_() && mediaSequenceToStartTime.has(position)) {
       firstStartTime = mediaSequenceToStartTime.get(position);
     }
+    // This is for recovering from disconnects.
+    if (firstStartTime === 0 &&
+        this.presentationType_ == shaka.hls.HlsParser.PresentationType_.LIVE &&
+        mediaSequenceToStartTime.size > 0 &&
+        !mediaSequenceToStartTime.has(position)) {
+      firstStartTime = this.presentationTimeline_.getSegmentAvailabilityStart();
+    }
 
     /** @type {!Array.<!shaka.media.SegmentReference>} */
     const references = [];
@@ -3766,7 +3773,9 @@ shaka.hls.HlsParser = class {
 
       contentMimeType = response.headers['content-type'];
     } catch (error) {
-      if (error && error.code == shaka.util.Error.Code.HTTP_ERROR) {
+      if (error &&
+        (error.code == shaka.util.Error.Code.HTTP_ERROR ||
+         error.code == shaka.util.Error.Code.BAD_HTTP_STATUS)) {
         headRequest.method = 'GET';
         const response = await this.makeNetworkRequest_(
             headRequest, requestType, {type});

package/lib/net/networking_utils.js

@@ -37,7 +37,9 @@ shaka.net.NetworkingUtils = class {
       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) {
+      if (error &&
+        (error.code == shaka.util.Error.Code.HTTP_ERROR ||
+          error.code == shaka.util.Error.Code.BAD_HTTP_STATUS)) {
         request.method = 'GET';
         const response = await netEngine.request(type, request).promise;
         mimeType = response.headers['content-type'];

package/lib/player.js

@@ -6779,7 +6779,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.6.6' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.6.7' + '-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

@@ -791,3 +791,9 @@ shaka.polyfill.PatchedMediaKeysApple.MediaKeyStatusMap = class {
     goog.asserts.assert(false, 'Not used!  Provided only for the compiler.');
   }
 };
+
+if (!navigator.requestMediaKeySystemAccess ||
+    // eslint-disable-next-line no-restricted-syntax
+    !MediaKeySystemAccess.prototype.getConfiguration) {
+  shaka.polyfill.register(shaka.polyfill.PatchedMediaKeysApple.install);
+}

package/lib/util/periods.js

@@ -1097,6 +1097,11 @@ shaka.util.PeriodCombiner = class {
       return true;
     }
 
+    // Forced subtitles should be treated as unique streams
+    if (outputStream.forced !== candidate.forced) {
+      return false;
+    }
+
     const languageRelatedness = LanguageUtils.relatedness(
         outputStream.language, candidate.language);
 

package/package.json

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

package/test/util/periods_unit.js

@@ -603,6 +603,55 @@ describe('PeriodCombiner', () => {
     }
   });
 
+  // Regression test for #6054, where we failed on multi-period content with
+  // different numbers of forced-subtitle streams per period.
+  it('Does not combine subtitle and forced-subtitle tracks', async () => {
+    const videoStreams = [makeVideoStream(1280)];
+    const audioStreams = [makeAudioStream('en', /* channels= */ 2)];
+    const imageStreams = [];
+
+    const forcedSubtitle = makeTextStream('de');
+    forcedSubtitle.roles = ['forced-subtitle'];
+    forcedSubtitle.forced = true;
+
+    const subtitle = makeTextStream('de');
+    subtitle.roles = ['subtitle'];
+
+    /** @type {!Array.<shaka.extern.Period>} */
+    const periods = [
+      {
+        id: '1',
+        videoStreams,
+        audioStreams,
+        textStreams: [
+          forcedSubtitle,
+          subtitle,
+        ],
+        imageStreams,
+      },
+      {
+        id: '2',
+        videoStreams,
+        audioStreams,
+        textStreams: [
+          subtitle,
+        ],
+        imageStreams,
+      },
+      {
+        id: '3',
+        videoStreams,
+        audioStreams,
+        textStreams: [],
+        imageStreams,
+      },
+    ];
+
+    await combiner.combinePeriods(periods, /* isDynamic= */ true);
+    const textStreams = combiner.getTextStreams();
+    expect(textStreams.every((s) => s.roles.length === 1)).toBe(true);
+  });
+
   // Regression test for #3383, where we failed on multi-period content with
   // multiple image streams per period.
   it('Can handle multiple image streams', async () => {