shaka-player 4.9.28 → 4.9.30

package/lib/util/platform.js

@@ -301,7 +301,8 @@ shaka.util.Platform = class {
         !shaka.util.Platform.isPS4() &&
         !shaka.util.Platform.isAmazonFireTV() &&
         !shaka.util.Platform.isWPE() &&
-        !shaka.util.Platform.isZenterio();
+        !shaka.util.Platform.isZenterio() &&
+        !shaka.util.Platform.isSkyQ();
   }
 
   /**
@@ -346,6 +347,13 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('SOPOpenBrowser');
   }
 
+  /**
+   * Check if the current platform is SkyQ STB.
+   */
+  static isSkyQ() {
+    return shaka.util.Platform.userAgentContains_('Sky_STB');
+  }
+
   /**
    * Check if the current platform is Amazon Fire TV.
    * https://developer.amazon.com/docs/fire-tv/identify-amazon-fire-tv-devices.html
@@ -621,7 +629,7 @@ shaka.util.Platform = class {
    *
    * Some devices are known not to support `MediaSource.changeType`
    * well. These devices should use the reload strategy. If a device
-   * reports that it supports `changeType` but support it reliabley
+   * reports that it supports `changeType` but support it unreliably
    * it should be added to this list.
    *
    * @return {boolean}
@@ -630,7 +638,8 @@ shaka.util.Platform = class {
     const Platform = shaka.util.Platform;
     if (Platform.isTizen2() || Platform.isTizen3() || Platform.isTizen4() ||
         Platform.isTizen5() || Platform.isTizen6() || Platform.isWebOS3() ||
-        Platform.isWebOS4() || Platform.isWebOS5()) {
+        Platform.isWebOS4() || Platform.isWebOS5() || Platform.isPS4() ||
+        Platform.isPS5()) {
       return false;
     }
     // Older chromecasts without GoogleTV seem to not support SMOOTH properly.

package/lib/util/player_configuration.js

@@ -11,6 +11,7 @@ goog.require('shaka.abr.SimpleAbrManager');
 goog.require('shaka.config.AutoShowText');
 goog.require('shaka.config.CodecSwitchingStrategy');
 goog.require('shaka.log');
+goog.require('shaka.media.Capabilities');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.ConfigUtils');
 goog.require('shaka.util.FairPlayUtils');
@@ -103,7 +104,8 @@ shaka.util.PlayerConfiguration = class {
 
     let codecSwitchingStrategy = shaka.config.CodecSwitchingStrategy.RELOAD;
     let multiTypeVariantsAllowed = false;
-    if (shaka.util.Platform.supportsSmoothCodecSwitching()) {
+    if (shaka.media.Capabilities.isChangeTypeSupported() &&
+        shaka.util.Platform.supportsSmoothCodecSwitching()) {
       codecSwitchingStrategy = shaka.config.CodecSwitchingStrategy.SMOOTH;
       multiTypeVariantsAllowed = true;
     }

package/package.json

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

package/ui/externs/ui.js

@@ -226,7 +226,8 @@ shaka.extern.UIVolumeBarColors;
  * @property {boolean} seekOnTaps
  *   Indicates whether or not a fast-forward and rewind tap button that seeks
  *   video some seconds.
- *   Defaults to true.
+ *   Defaults to true if the browser <code>navigator.maxTouchPoints > 0</code>
+ *   is true.
  * @property {number} tapSeekDistance
  *   The time interval, in seconds, to seek when the user presses the left or
  *   right part of the video. If less than or equal to 0,

package/ui/locales/zh-HK.json

@@ -1,30 +1,49 @@
 {
+  "AD_DURATION": "廣告長度",
+  "AD_PROGRESS": "廣告 [AD_ON]/[NUM_ADS]",
+  "AD_STATISTICS": "廣告統計資料",
+  "AD_TIME": "廣告：[AD_TIME]",
+  "AIRPLAY": "AirPlay",
   "AUTO_QUALITY": "自動",
   "BACK": "返回",
   "CAPTIONS": "字幕",
   "CAST": "投放…",
-  "ENTER_PICTURE_IN_PICTURE": "進入畫中畫",
-  "EXIT_FULL_SCREEN": "結束全螢幕",
+  "CHAPTERS": "章節",
+  "DOWNLOAD_VIDEO_FRAME": "儲存影片影格",
+  "ENTER_LOOP_MODE": "循環播放目前的影片",
+  "ENTER_PICTURE_IN_PICTURE": "進入子母畫面",
+  "EXIT_FULL_SCREEN": "退出全螢幕模式",
+  "EXIT_LOOP_MODE": "停止循環播放目前的影片",
   "EXIT_PICTURE_IN_PICTURE": "退出畫中畫",
   "FAST_FORWARD": "快轉",
   "FULL_SCREEN": "全螢幕",
   "LANGUAGE": "語言",
   "LIVE": "直播",
-  "MORE_SETTINGS": "更多設定",
+  "LOOP": "循環播放",
+  "MORE_SETTINGS": "顯示更多設定",
   "MULTIPLE_LANGUAGES": "多種語言",
-  "MUTE": "靜音",
+  "MUTE": "静音",
   "NOT_APPLICABLE": "不適用",
-  "OFF": "未選取",
-  "ON": "",
+  "OFF": "關閉",
+  "ON": "開啟",
   "PAUSE": "暫停",
   "PICTURE_IN_PICTURE": "畫中畫",
   "PLAY": "播放",
-  "RESOLUTION": "",
+  "PLAYBACK_RATE": "播放速度",
+  "QUALITY": "音質",
+  "RECENTER_VR": "重新置中",
+  "REPLAY": "重播",
+  "RESOLUTION": "解析度",
   "REWIND": "倒帶",
-  "SEEK": "搜尋滑桿",
-  "SKIP_TO_LIVE": "直播",
+  "SEEK": "進度",
+  "SKIP_AD": "略過廣告",
+  "SKIP_TO_LIVE": "跳至当前直播",
+  "STATISTICS": "統計資料",
+  "SUBTITLE_FORCED": "強制",
+  "SURROUND": "環迴音效",
+  "TOGGLE_STEREOSCOPIC": "切換立體視覺",
   "UNDETERMINED_LANGUAGE": "不明",
-  "UNMUTE": "解除靜音",
-  "UNRECOGNIZED_LANGUAGE": "不明",
+  "UNMUTE": "取消靜音",
+  "UNRECOGNIZED_LANGUAGE": "無法辨識",
   "VOLUME": "音量"
 }

package/ui/remote_button.js

@@ -72,7 +72,7 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
 
     shaka.ui.Utils.setDisplay(this.remoteButton_, false);
 
-    if (!this.video.remote || this.video.disableRemotePlayback) {
+    if (!this.video.remote) {
       this.remoteButton_.classList.add('shaka-hidden');
     } else {
       this.eventManager.listen(
@@ -138,10 +138,11 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
     } else if (this.video.remote.state == 'disconnected') {
       const handleAvailabilityChange = (availability) => {
         if (this.player) {
+          const disableRemote = this.video.disableRemotePlayback;
           const loadMode = this.player.getLoadMode();
           const srcMode = loadMode == shaka.Player.LoadMode.SRC_EQUALS;
           shaka.ui.Utils.setDisplay(
-              this.remoteButton_, srcMode && availability);
+              this.remoteButton_, srcMode && availability && !disableRemote);
         } else {
           shaka.ui.Utils.setDisplay(this.remoteButton_, false);
         }

package/ui/resolution_selection.js

@@ -19,6 +19,7 @@ goog.require('shaka.ui.SettingsMenu');
 goog.require('shaka.ui.Utils');
 goog.require('shaka.util.Dom');
 goog.require('shaka.util.FakeEvent');
+goog.require('shaka.util.Functional');
 goog.requireType('shaka.ui.Controls');
 
 
@@ -91,6 +92,7 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
           return false;
         }
         if (this.controls.getConfig().showAudioChannelCountVariants &&
+            track.channelsCount && selectedTrack.channelsCount &&
             track.channelsCount != selectedTrack.channelsCount) {
           return false;
         }
@@ -117,7 +119,8 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
         return tracks.findIndex((t) => t.bandwidth == track.bandwidth) == idx;
       });
     } else {
-      const audiosIds = [...new Set(tracks.map((t) => t.audioId))];
+      const audiosIds = [...new Set(tracks.map((t) => t.audioId))]
+          .filter(shaka.util.Functional.isNotNull);
       if (audiosIds.length > 1) {
         tracks = tracks.filter((track, idx) => {
           // Keep the first one with the same height and framerate or bandwidth.

package/ui/ui.js

@@ -252,7 +252,7 @@ shaka.ui.Overlay = class {
       fullScreenElement: this.videoContainer_,
       preferDocumentPictureInPicture: true,
       showAudioChannelCountVariants: true,
-      seekOnTaps: true,
+      seekOnTaps: navigator.maxTouchPoints > 0,
       tapSeekDistance: 10,
       refreshTickInSeconds: 0.125,
       displayInVrMode: false,
@@ -275,6 +275,9 @@ shaka.ui.Overlay = class {
           (name) => name != 'play_pause' && name != 'volume');
     }
 
+    // Set this button here to push it at the end.
+    config.overflowMenuButtons.push('save_video_frame');
+
     return config;
   }
 
@@ -476,6 +479,8 @@ shaka.ui.Overlay = class {
       video.removeAttribute('src');
     }
 
+    await player.attach(shaka.util.Dom.asHTMLMediaElement(video));
+
     for (const elem of video.querySelectorAll('source')) {
       try { // eslint-disable-next-line no-await-in-loop
         await ui.getControls().getPlayer().load(elem.getAttribute('src'));
@@ -484,8 +489,6 @@ shaka.ui.Overlay = class {
         shaka.log.error('Error auto-loading asset', e);
       }
     }
-
-    await player.attach(shaka.util.Dom.asHTMLMediaElement(video));
   }