Merge remote-tracking branch 'upstream/main'

demo/config.js

@@ -548,6 +548,7 @@ shakaDemo.Config = class {
     this.latestInput_.input().value = shakaDemoMain.getUILocale();
     this.addNumberInput_('Preferred Audio Channel Count',
         'preferredAudioChannelCount');
+    this.addBoolInput_('Prefer Spatial Audio', 'preferSpatialAudio');
     this.addBoolInput_('Prefer Forced Subs', 'preferForcedSubs');
   }
 

externs/shaka/player.js

@@ -1605,6 +1605,7 @@ shaka.extern.OfflineConfiguration;
  *   preferredVideoLabel: string,
  *   preferredDecodingAttributes: !Array.<string>,
  *   preferForcedSubs: boolean,
+ *   preferSpatialAudio: boolean,
  *   restrictions: shaka.extern.Restrictions,
  *   playRangeStart: number,
  *   playRangeEnd: number,
@@ -1681,6 +1682,8 @@ shaka.extern.OfflineConfiguration;
  *   If the content has no forced captions and the value is true,
  *   no text track is chosen.
  *   Changing this during playback will not affect the current playback.
+ * @property {boolean} preferSpatialAudio
+ *   If true, a spatial audio track is preferred.  Defaults to false.
  * @property {shaka.extern.Restrictions} restrictions
  *   The application restrictions to apply to the tracks.  These are "hard"
  *   restrictions.  Any track that fails to meet these restrictions will not

lib/hls/hls_parser.js

@@ -3753,14 +3753,26 @@ shaka.hls.HlsParser = class {
 
     // If unable to guess mime type, request a segment and try getting it
     // from the response.
+    let contentMimeType;
+    const type = shaka.net.NetworkingEngine.AdvancedRequestType.MEDIA_SEGMENT;
     const headRequest = shaka.net.NetworkingEngine.makeRequest(
         middleSegmentUris, this.config_.retryParameters);
-    headRequest.method = 'HEAD';
-    const type = shaka.net.NetworkingEngine.AdvancedRequestType.MEDIA_SEGMENT;
-    const response = await this.makeNetworkRequest_(
-        headRequest, requestType, {type});
+    try {
+      headRequest.method = 'HEAD';
+      const response = await this.makeNetworkRequest_(
+          headRequest, requestType, {type});
+
+      contentMimeType = response.headers['content-type'];
+    } catch (error) {
+      if (error && error.code == shaka.util.Error.Code.HTTP_ERROR) {
+        headRequest.method = 'GET';
+        const response = await this.makeNetworkRequest_(
+            headRequest, requestType, {type});
+
+        contentMimeType = response.headers['content-type'];
+      }
+    }
 
-    const contentMimeType = response.headers['content-type'];
     if (contentMimeType) {
       // Split the MIME type in case the server sent additional parameters.
       return contentMimeType.split(';')[0];

lib/media/adaptation_set_criteria.js

@@ -61,15 +61,16 @@ shaka.media.ExampleBasedCriteria = class {
     const audioLabel = '';
     const videoLabel = '';
     const hdrLevel = '';
+    const spatialAudio = false;
     const videoLayout = '';
     const channelCount = example.audio && example.audio.channelsCount ?
                          example.audio.channelsCount :
                          0;
 
     /** @private {!shaka.media.AdaptationSetCriteria} */
     this.fallback_ = new shaka.media.PreferenceBasedCriteria(
-        example.language, role, channelCount, hdrLevel, videoLayout,
-        audioLabel, videoLabel,
+        example.language, role, channelCount, hdrLevel, spatialAudio,
+        videoLayout, audioLabel, videoLabel,
         codecSwitchingStrategy, enableAudioGroups);
   }
 
@@ -108,14 +109,15 @@ shaka.media.PreferenceBasedCriteria = class {
    * @param {string} role
    * @param {number} channelCount
    * @param {string} hdrLevel
+   * @param {boolean} spatialAudio
    * @param {string} videoLayout
    * @param {string=} audioLabel
    * @param {string=} videoLabel
    * @param {shaka.config.CodecSwitchingStrategy=} codecSwitchingStrategy
    * @param {boolean=} enableAudioGroups
    */
-  constructor(language, role, channelCount, hdrLevel, videoLayout,
-      audioLabel = '', videoLabel = '',
+  constructor(language, role, channelCount, hdrLevel, spatialAudio,
+      videoLayout, audioLabel = '', videoLabel = '',
       codecSwitchingStrategy = shaka.config.CodecSwitchingStrategy.RELOAD,
       enableAudioGroups = false) {
     /** @private {string} */
@@ -126,6 +128,8 @@ shaka.media.PreferenceBasedCriteria = class {
     this.channelCount_ = channelCount;
     /** @private {string} */
     this.hdrLevel_ = hdrLevel;
+    /** @private {boolean} */
+    this.spatialAudio_ = spatialAudio;
     /** @private {string} */
     this.videoLayout_ = videoLayout;
     /** @private {string} */
@@ -217,6 +221,14 @@ shaka.media.PreferenceBasedCriteria = class {
       }
     }
 
+    const bySpatialAudio = Class.filterVariantsBySpatialAudio_(
+        current, this.spatialAudio_);
+    if (bySpatialAudio.length) {
+      current = bySpatialAudio;
+    } else {
+      shaka.log.warning('No exact match for spatial audio could be found.');
+    }
+
     const supportsSmoothCodecTransitions = this.codecSwitchingStrategy_ ==
       shaka.config.CodecSwitchingStrategy.SMOOTH &&
         shaka.media.Capabilities.isChangeTypeSupported();
@@ -374,4 +386,21 @@ shaka.media.PreferenceBasedCriteria = class {
       return true;
     });
   }
+
+
+  /**
+   * Filters variants according to the given spatial audio config.
+   *
+   * @param {!Array.<shaka.extern.Variant>} variants
+   * @param {boolean} spatialAudio
+   * @private
+   */
+  static filterVariantsBySpatialAudio_(variants, spatialAudio) {
+    return variants.filter((variant) => {
+      if (variant.audio && variant.audio.spatialAudio != spatialAudio) {
+        return false;
+      }
+      return true;
+    });
+  }
 };

lib/player.js

@@ -680,6 +680,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
             this.config_.preferredVariantRole,
             this.config_.preferredAudioChannelCount,
             this.config_.preferredVideoHdrLevel,
+            this.config_.preferSpatialAudio,
             this.config_.preferredVideoLayout,
             this.config_.preferredAudioLabel,
             this.config_.preferredVideoLabel,
@@ -1857,6 +1858,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
             this.config_.preferredVariantRole,
             this.config_.preferredAudioChannelCount,
             this.config_.preferredVideoHdrLevel,
+            this.config_.preferSpatialAudio,
             this.config_.preferredVideoLayout,
             this.config_.preferredAudioLabel,
             this.config_.preferredVideoLabel,
@@ -4064,6 +4066,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
               role || '',
               channelsCount,
               /* hdrLevel= */ '',
+              /* spatialAudio= */ false,
               /* videoLayout= */ '',
               /* audioLabel= */ '',
               /* videoLabel= */ '',
@@ -4189,6 +4192,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
               /* role= */ '',
               /* channelCount= */ 0,
               /* hdrLevel= */ '',
+              /* spatialAudio= */ false,
               /* videoLayout= */ '',
               label,
               /* videoLabel= */ '',
@@ -6462,6 +6466,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     }  // if (keyIds.size)
 
     if (tracksChanged) {
+      this.onTracksChanged_();
       const variantsUpdated = this.updateAbrManagerVariants_();
       if (!variantsUpdated) {
         return;
@@ -6473,10 +6478,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       shaka.log.debug('Choosing new streams after key status changed');
       this.chooseVariantAndSwitch_();
     }
-
-    if (tracksChanged) {
-      this.onTracksChanged_();
-    }
   }
 
   /**

lib/text/vtt_text_parser.js

@@ -826,9 +826,9 @@ shaka.text.VttTextParser = class {
     } else if ((results = /^size:([\d.]+)%$/.exec(word))) {
       cue.size = Number(results[1]);
     } else if ((results =
-      // eslint-disable-next-line max-len
-      /^position:([\d.]+)%(?:,(line-left|line-right|middle|center|start|end|auto))?$/
-          .exec(word))) {
+        // eslint-disable-next-line max-len
+        /^position:([\d.]+)%(?:,(line-left|line-right|middle|center|start|end|auto))?$/
+            .exec(word))) {
       cue.position = Number(results[1]);
       if (results[2]) {
         VttTextParser.setPositionAlign_(cue, results[2]);

lib/util/player_configuration.js

@@ -364,6 +364,7 @@ shaka.util.PlayerConfiguration = class {
       preferredVideoCodecs: [],
       preferredAudioCodecs: [],
       preferForcedSubs: false,
+      preferSpatialAudio: false,
       preferredDecodingAttributes: [],
       restrictions: {
         minWidth: 0,