@byteplus/veplayer 2.4.1-rc.1 → 2.4.2-rc.0

package/esm/veplayer.live.development.js

@@ -1312,7 +1312,7 @@ var VERSION_REG = {
   android: /(Android)\s([\d.]+)/,
   ios: /(Version)\/([\d.]+)/
 };
-var H264_MIMETYPES = ["avc1.42E01E, mp4a.40.2", "avc1.58A01E, mp4a.40.2", "avc1.4D401E, mp4a.40.2", "avc1.64001E, mp4a.40.2", "avc1.42E01E", "mp4v.20.8", "mp4v.20.8, mp4a.40.2", "mp4v.20.240, mp4a.40.2"];
+var H264_MIMETYPES = ["avc1.42E01E, mp4a.40.2", "avc1.58A01E, mp4a.40.2", "avc1.4D401E, mp4a.40.2", "avc1.64001E, mp4a.40.2", "avc1.42E01E", "mp4v.20.8", "avc1.42E01E, mp4a.40.2", "avc1.58A01E, mp4a.40.2", "avc1.4D401E, mp4a.40.2", "avc1.64001E, mp4a.40.2", "mp4v.20.8, mp4a.40.2", "mp4v.20.240, mp4a.40.2"];
 var sniffer$1 = {
   get device() {
     var r2 = sniffer$1.os;
@@ -1457,7 +1457,7 @@ var sniffer$1 = {
     }
   }
 };
-var version = "3.0.20-rc.3";
+var version = "3.0.19-rc.0";
 var ERROR_TYPE_MAP = {
   1: "media",
   2: "media",
@@ -3417,7 +3417,7 @@ var ResizeObserver = /* @__PURE__ */ function() {
       if (!this.observer) {
         return;
       }
-      this.observer.observe(target);
+      this.observer && this.observer.observe(target);
       var _pid = target.getAttribute(PLATER_ID);
       var __handlers = this.__handlers;
       var index = -1;
@@ -3446,17 +3446,16 @@ var ResizeObserver = /* @__PURE__ */ function() {
         }
       });
       try {
-        var _this$observer;
-        (_this$observer = this.observer) === null || _this$observer === void 0 ? void 0 : _this$observer.unobserve(target);
+        this.observer && this.observer.unobserve(target);
       } catch (e3) {
       }
+      this.observer && this.observer.unobserve(target);
       i2 > -1 && this.__handlers.splice(i2, 1);
     }
   }, {
     key: "destroyObserver",
     value: function destroyObserver() {
-      var _this$observer2;
-      (_this$observer2 = this.observer) === null || _this$observer2 === void 0 ? void 0 : _this$observer2.disconnect();
+      this.observer && this.observer.disconnect();
       this.observer = null;
       this.__handlers = null;
     }
@@ -3488,8 +3487,7 @@ function addObserver(target, handler) {
   return resizeObserver;
 }
 function unObserver(target, handler) {
-  var _resizeObserver;
-  (_resizeObserver = resizeObserver) === null || _resizeObserver === void 0 ? void 0 : _resizeObserver.unObserver(target, handler);
+  resizeObserver.unObserver(target, handler);
 }
 var pluginsManager = {
   pluginGroup: {},
@@ -4487,7 +4485,10 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
       }
       var _this$config = _this.config, autoplay2 = _this$config.autoplay, defaultPlaybackRate = _this$config.defaultPlaybackRate;
       XG_DEBUG.logInfo("player", "canPlayFunc, startTime", _this.__startTime);
-      _this._seekToStartTime();
+      if (_this.__startTime > 0 && _this.duration > 0) {
+        _this.currentTime = _this.__startTime > _this.duration ? _this.duration : _this.__startTime;
+        _this.__startTime = -1;
+      }
       _this.playbackRate = defaultPlaybackRate;
       (autoplay2 || _this._useAutoplay) && _this.mediaPlay();
       _this.off(CANPLAY, _this.canPlayFunc);
@@ -5109,7 +5110,10 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
           reject(e3);
         };
         var _canplay = function _canplay2() {
-          _this9._seekToStartTime();
+          if (_this9.duration > 0 && _this9.__startTime > 0) {
+            _this9.currentTime = _this9.__startTime;
+            _this9.__startTime = -1;
+          }
           if (isPaused) {
             _this9.pause();
           }
@@ -5730,17 +5734,11 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
   }, {
     key: "onLoadeddata",
     value: function onLoadeddata() {
-      var _this22 = this;
       this.isError = false;
       this.isSeeking = false;
-      if (this.__startTime > 0) {
-        if (this.duration > 0) {
-          this._seekToStartTime();
-        } else {
-          this.once(DURATION_CHANGE, function() {
-            _this22._seekToStartTime();
-          });
-        }
+      if (this.__startTime > 0 && this.duration > 0) {
+        this.currentTime = this.__startTime;
+        this.__startTime = -1;
       }
     }
   }, {
@@ -5809,27 +5807,27 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
   }, {
     key: "onWaiting",
     value: function onWaiting() {
-      var _this23 = this;
+      var _this22 = this;
       if (this.waitTimer) {
         util$1.clearTimeout(this, this.waitTimer);
       }
       this.updateAcc("waiting");
       this.waitTimer = util$1.setTimeout(this, function() {
-        _this23.addClass(STATE_CLASS.LOADING);
-        _this23.emit(LOADING);
-        util$1.clearTimeout(_this23, _this23.waitTimer);
-        _this23.waitTimer = null;
+        _this22.addClass(STATE_CLASS.LOADING);
+        _this22.emit(LOADING);
+        util$1.clearTimeout(_this22, _this22.waitTimer);
+        _this22.waitTimer = null;
       }, this.config.minWaitDelay);
     }
   }, {
     key: "onPlaying",
     value: function onPlaying() {
-      var _this24 = this;
+      var _this23 = this;
       this.isError = false;
       var NO_START = STATE_CLASS.NO_START, PAUSED = STATE_CLASS.PAUSED, ENDED2 = STATE_CLASS.ENDED, ERROR2 = STATE_CLASS.ERROR, REPLAY2 = STATE_CLASS.REPLAY, LOADING2 = STATE_CLASS.LOADING;
       var clsList = [NO_START, PAUSED, ENDED2, ERROR2, REPLAY2, LOADING2];
       clsList.forEach(function(cls) {
-        _this24.removeClass(cls);
+        _this23.removeClass(cls);
       });
       if (!this._accPlayed.t && !this.paused && !this.ended) {
         this._accPlayed.t = (/* @__PURE__ */ new Date()).getTime();
@@ -5990,14 +5988,14 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
   }, {
     key: "setConfig",
     value: function setConfig(config) {
-      var _this25 = this;
+      var _this24 = this;
       if (!config) {
         return;
       }
       Object.keys(config).map(function(key) {
         if (key !== "plugins") {
-          _this25.config[key] = config[key];
-          var plugin = _this25.plugins[key.toLowerCase()];
+          _this24.config[key] = config[key];
+          var plugin = _this24.plugins[key.toLowerCase()];
           if (plugin && util$1.typeOf(plugin.setConfig) === "Function") {
             plugin.setConfig(config[key]);
           }
@@ -6007,20 +6005,20 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
   }, {
     key: "playNext",
     value: function playNext(config) {
-      var _this26 = this;
+      var _this25 = this;
       this.resetState();
       this.setConfig(config);
       this._currentTime = 0;
       this._duration = 0;
       runHooks(this, "playnext", function() {
-        _this26.start();
-        _this26.emit(PLAYNEXT, config);
+        _this25.start();
+        _this25.emit(PLAYNEXT, config);
       });
     }
   }, {
     key: "resize",
     value: function resize() {
-      var _this27 = this;
+      var _this26 = this;
       if (!this.media) {
         return;
       }
@@ -6060,7 +6058,7 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
       }
       if (!this.fullscreen && !this.cssfullscreen) {
         Object.keys(_style).forEach(function(key) {
-          _this27.root.style[key] = _style[key];
+          _this26.root.style[key] = _style[key];
         });
       }
       if (videoFillMode === "fillHeight" && fit < videoFit || videoFillMode === "fillWidth" && fit > videoFit) {
@@ -6102,14 +6100,6 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
         url
       };
     }
-  }, {
-    key: "_seekToStartTime",
-    value: function _seekToStartTime() {
-      if (this.__startTime > 0 && this.duration > 0) {
-        this.currentTime = this.__startTime > this.duration ? this.duration : this.__startTime;
-        this.__startTime = -1;
-      }
-    }
   }, {
     key: "state",
     get: function get() {
@@ -6160,15 +6150,15 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
       return this.config.definition.list || [];
     },
     set: function set(list) {
-      var _this28 = this;
+      var _this27 = this;
       var definition = this.config.definition;
       var curDef = null;
       var targetDef = null;
       definition.list = list;
       this.emit("resourceReady", list);
       list.forEach(function(item) {
-        var _this28$curDefinition;
-        if (((_this28$curDefinition = _this28.curDefinition) === null || _this28$curDefinition === void 0 ? void 0 : _this28$curDefinition.definition) === item.definition) {
+        var _this27$curDefinition;
+        if (((_this27$curDefinition = _this27.curDefinition) === null || _this27$curDefinition === void 0 ? void 0 : _this27$curDefinition.definition) === item.definition) {
           curDef = item;
         }
         if (definition.defaultDefinition === item.definition) {
@@ -8453,7 +8443,7 @@ var MobilePlugin = /* @__PURE__ */ function(_Plugin) {
       }
       this.on(DURATION_CHANGE, function() {
         var player2 = _this2.player, config2 = _this2.config;
-        if (player2.duration > 0 && player2.duration * 1e3 < config2.moveDuration) {
+        if (player2.duration * 1e3 < config2.moveDuration) {
           config2.moveDuration = player2.duration * 1e3;
         }
       });
@@ -8767,13 +8757,10 @@ var MobilePlugin = /* @__PURE__ */ function(_Plugin) {
   }, {
     key: "updateBrightness",
     value: function updateBrightness(percent) {
-      var pos = this.pos, config = this.config, xgMask = this.xgMask;
-      if (!config.darkness) {
-        return;
-      }
       if (this.player.rotateDeg) {
         percent = -percent;
       }
+      var pos = this.pos, config = this.config, xgMask = this.xgMask;
       var light = pos.light + 0.8 * percent;
       light = light > config.maxDarkness ? config.maxDarkness : light < 0 ? 0 : light;
       if (xgMask) {
@@ -13755,7 +13742,7 @@ class VePlayerBase {
    * @returns
    */
   get playerVersion() {
-    return "2.4.1-rc.1";
+    return "2.4.2-rc.0";
   }
   /** {zh}
    * @brief 获取当前播放视频的清晰度唯一标识（definition）。
@@ -19076,29 +19063,6 @@ async function isRTMSupportCodec(codec = RTMCodec.H264) {
     return RtmPlugin.isSupportedH264();
   return false;
 }
-const getAbrStrategy = async (options) => {
-  var _a, _b;
-  const streamType = options.url && getStreamType(options.url);
-  if (streamType === "rtm") {
-    return {};
-  }
-  const abrOptions = streamType === "flv" ? (_a = options == null ? void 0 : options.flv) == null ? void 0 : _a.abr : (_b = options == null ? void 0 : options.hls) == null ? void 0 : _b.abr;
-  if (!abrOptions) {
-    return {};
-  }
-  const abrPlugin = await load(DynamicModule.PluginAbr).catch(() => void 0);
-  return {
-    options: {
-      [streamType === "flv" ? "abr" : "hlsabr"]: {
-        ...abrOptions,
-        open: abrOptions.enable ?? true
-      }
-    },
-    plugins: [
-      streamType === "flv" ? abrPlugin == null ? void 0 : abrPlugin.AbrPlugin : abrPlugin == null ? void 0 : abrPlugin.HlsAbrPlugin
-    ]
-  };
-};
 const rtmStrategy = {
   options: {},
   module: DynamicModule.PluginRtm
@@ -19113,8 +19077,6 @@ const generateFallbackUrl = (url) => {
 const getRtmStrategy = async (options, player) => {
   var _a;
   let backupStrategy;
-  let backupOptions = {};
-  let backupModule = [];
   const { url } = options;
   const {
     fallbackUrl,
@@ -19129,7 +19091,7 @@ const getRtmStrategy = async (options, player) => {
   } else if (backupType === "hls" && (sniffer$1.device !== "mobile" || ((_a = options == null ? void 0 : options.hls) == null ? void 0 : _a.enableMSE)) && util.isMseSupported(Codec.H264)) {
     backupStrategy = createHlsMseStrategy(options);
   }
-  const [rtmCdn, backupCdn, backupAbr] = await Promise.all([
+  const [rtmCdn, backupCdn] = await Promise.all([
     load(rtmStrategy.module).then((module) => {
       return module.RtmPlugin;
     }).catch(() => void 0),
@@ -19139,18 +19101,8 @@ const getRtmStrategy = async (options, player) => {
       } else if ((backupStrategy == null ? void 0 : backupStrategy.module) === DynamicModule.PluginHls) {
         return module.HlsPlugin;
       }
-    }).catch(() => void 0),
-    getAbrStrategy({ ...options, url: actualFallbackUrl }).catch(
-      () => void 0
-    )
+    }).catch(() => void 0)
   ]);
-  if (backupType) {
-    backupOptions = {
-      ...backupStrategy == null ? void 0 : backupStrategy.options,
-      ...backupAbr == null ? void 0 : backupAbr.options
-    };
-    backupModule = [backupCdn, ...(backupAbr == null ? void 0 : backupAbr.plugins) ?? []];
-  }
   const [RTMSupported, RTMSupportCodec] = await Promise.all([
     isRTMSupported(),
     isRTMSupportCodec()
@@ -19168,7 +19120,7 @@ const getRtmStrategy = async (options, player) => {
     }
     return {
       options: {
-        ...backupOptions || {},
+        ...(backupStrategy == null ? void 0 : backupStrategy.options) || {},
         url: actualFallbackUrl,
         _RTMdegrade: {
           _originRtmUrl: url,
@@ -19176,19 +19128,19 @@ const getRtmStrategy = async (options, player) => {
           _isRTMSupportCodec: RTMSupportCodec
         }
       },
-      plugins: backupModule
+      plugins: backupCdn ? [backupCdn] : []
     };
   }
   return {
     options: {
-      ...backupOptions || {},
+      ...(backupStrategy == null ? void 0 : backupStrategy.options) || {},
       url: enableRTMAutoTranscode ? util.appendSearchParams(url, { enableRTMAutoTranscode: "true" }) : void 0,
       _RTMdegrade: void 0,
       rts: {
         retryCount: 0,
         ...ret,
         backupURL: actualFallbackUrl,
-        backupConstruct: backupModule
+        backupConstruct: backupCdn
       }
     },
     plugins: rtmCdn ? [rtmCdn] : []
@@ -22042,10 +21994,10 @@ class Logger extends Plugin {
       user_id: this._userId,
       device_id: this._deviceId,
       ext: {
-        veplayer_version: "2.4.1-rc.1",
-        flv_version: "3.0.20-rc.3",
-        hls_version: "3.0.20-rc.3",
-        rts_version: "0.2.1-alpha.1"
+        veplayer_version: "2.4.2-rc.0",
+        flv_version: "3.0.19-rc.0",
+        hls_version: "3.0.19-rc.0",
+        rts_version: "0.2.1-alpha.2"
       }
     });
   }
@@ -22339,6 +22291,29 @@ const getDrmStrategy = async (options, player) => {
   }
   return {};
 };
+const getAbrStrategy = async (options) => {
+  var _a, _b;
+  const streamType = options.url && getStreamType(options.url);
+  if (streamType === "rtm") {
+    return {};
+  }
+  const abrOptions = streamType === "flv" ? (_a = options == null ? void 0 : options.flv) == null ? void 0 : _a.abr : (_b = options == null ? void 0 : options.hls) == null ? void 0 : _b.abr;
+  if (!abrOptions) {
+    return {};
+  }
+  const abrPlugin = await load(DynamicModule.PluginAbr).catch(() => void 0);
+  return {
+    options: {
+      [streamType === "flv" ? "abr" : "hlsabr"]: {
+        ...abrOptions,
+        open: abrOptions.enable ?? true
+      }
+    },
+    plugins: [
+      streamType === "flv" ? abrPlugin == null ? void 0 : abrPlugin.AbrPlugin : abrPlugin == null ? void 0 : abrPlugin.HlsAbrPlugin
+    ]
+  };
+};
 VeI18n.extend([
   {
     LANG: "zh-cn",
@@ -22510,28 +22485,6 @@ class VePlayerLive extends VePlayerBase {
     var _a, _b, _c;
     return (_c = (_b = (_a = this._player) == null ? void 0 : _a.plugins) == null ? void 0 : _b.flv) == null ? void 0 : _c.getStats();
   }
-  /** {zh}
-   * @brief 调用此方法开始播放 。
-   */
-  /** {en}
-   * @brief Starts playback.
-   */
-  play() {
-    this.openAbr();
-    /* istanbul ignore next -- @preserve */
-    return this._player.play();
-  }
-  /** {zh}
-   * @brief 调用此方法暂停播放。
-   */
-  /** {en}
-   * @brief Pauses playback.
-   */
-  pause() {
-    this.closeAbr();
-    /* istanbul ignore next -- @preserve */
-    return this._player.pause();
-  }
 }
 async function createLivePlayer(options) {
   var _a, _b;