@volcengine/veplayer 2.5.1-rc.2 → 2.5.2-rc.0

package/umd/veplayer.vod.d.ts

@@ -419,7 +419,14 @@ declare enum Level {
     /** {en}
      * @brief Error.
      */
-    Error = "Error"
+    Error = "Error",
+    /** {zh}
+     * @brief 提示。
+     */
+    /** {en}
+     * @brief Warn.
+     */
+    Warn = "Warn"
 }
 declare enum ErrorCode {
     /** {zh}
@@ -1501,15 +1508,16 @@ type PrepareResult = {
     options?: Partial<VePlayerBaseOptions>;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     plugins?: any[];
+    useSrc?: boolean;
 };
 type PreparePlugins = (url: string) => Promise<PrepareResult> | undefined;
 /** {zh}
  * @detail option
- * @brief 视频的实际编码格式。如果您在degradation 设置了 SoftFirst 属性（即硬解不支持降级软解），建议您传入该参数，省去探测实际编码格式的操作。
+ * @brief 视频的实际编码格式。如果您在 degradation 设置了 SoftFirst 属性（即硬解不支持降级软解），建议您传入该参数，省去探测实际编码格式的操作。
  */
 /** {en}
  * @detail option
- * @brief The actual codec of the video.
+ * @brief The actual codec of the video. If you set the SoftFirst property in degradation (that is, hard solutions do not support downgrading soft solutions), it is recommended that you pass this parameter to save the operation of probing the actual encoding format.
  */
 declare enum Codec {
     /** {zh}
@@ -2147,16 +2155,17 @@ declare class VePlayerBase {
      * @hidden
      */
     prepare(url: string): Promise<{
-        plugins: any[];
+        plugins: any[] | undefined;
         options: Partial<VePlayerBaseOptions> | undefined;
+        isSameProtocol: boolean | "";
+        useSrc: boolean | undefined;
     }>;
     private _handleFallback;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     private _transformEvent;
     private _switch;
+    private _switchDifferentProtocolUrl;
     private _switchUrl;
-    // 获取需要卸载和需要注册的播放插件
-    private _diffPlugins;
     private _callBeforePlayerInitForUrl;
 }
 declare const enum State {
@@ -2679,7 +2688,14 @@ declare namespace strategy {
         /** {en}
          * @brief Error.
          */
-        Error = "Error"
+        Error = "Error",
+        /** {zh}
+         * @brief 提示。
+         */
+        /** {en}
+         * @brief Warn.
+         */
+        Warn = "Warn"
     }
     enum ErrorCode {
         /** {zh}
@@ -3824,15 +3840,16 @@ declare namespace strategy {
         options?: Partial<VePlayerBaseOptions>;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         plugins?: any[];
+        useSrc?: boolean;
     };
     type PreparePlugins = (url: string) => Promise<PrepareResult> | undefined;
     /** {zh}
      * @detail option
-     * @brief 视频的实际编码格式。如果您在degradation 设置了 SoftFirst 属性（即硬解不支持降级软解），建议您传入该参数，省去探测实际编码格式的操作。
+     * @brief 视频的实际编码格式。如果您在 degradation 设置了 SoftFirst 属性（即硬解不支持降级软解），建议您传入该参数，省去探测实际编码格式的操作。
      */
     /** {en}
      * @detail option
-     * @brief The actual codec of the video.
+     * @brief The actual codec of the video. If you set the SoftFirst property in degradation (that is, hard solutions do not support downgrading soft solutions), it is recommended that you pass this parameter to save the operation of probing the actual encoding format.
      */
     enum Codec {
         /** {zh}
@@ -4172,7 +4189,14 @@ declare namespace error {
         /** {en}
          * @brief Error.
          */
-        Error = "Error"
+        Error = "Error",
+        /** {zh}
+         * @brief 提示。
+         */
+        /** {en}
+         * @brief Warn.
+         */
+        Warn = "Warn"
     }
     enum ErrorCode {
         /** {zh}

package/umd/veplayer.vod.development.js

@@ -13710,7 +13710,7 @@ var __publicField = (obj, key, value) => {
      * @brief Retrieve the player SDK version number.
      */
     get playerVersion() {
-      return "2.5.1-rc.2";
+      return "2.5.2-rc.0";
     }
     /** {zh}
      * @brief 获取当前播放视频的清晰度唯一标识（definition）。
@@ -14194,25 +14194,27 @@ var __publicField = (obj, key, value) => {
      * @hidden
      */
     async prepare(url) {
-      var _a, _b;
+      var _a, _b, _c, _d, _e, _f, _g;
       const result = await ((_a = this._preparePlugins) == null ? void 0 : _a.call(this, url));
-      const { removedPlugins, addedPlugins } = this._diffPlugins(
-        ((_b = this._previousPrepareResult) == null ? void 0 : _b.plugins) ?? [],
-        (result == null ? void 0 : result.plugins) ?? []
-      );
-      removedPlugins == null ? void 0 : removedPlugins.forEach((pluginName) => {
-        /* istanbul ignore next -- @preserve */
-        this._player.unRegisterPlugin(pluginName);
-      });
+      const newUrl = ((_b = result == null ? void 0 : result.options) == null ? void 0 : _b.url) ?? url;
+      const oldUrl = (_d = (_c = this._player) == null ? void 0 : _c.config) == null ? void 0 : _d.url;
+      const isSameProtocol = oldUrl && getStreamType(newUrl) === getStreamType(oldUrl);
+      if (!isSameProtocol) {
+        (_f = (_e = this._previousPrepareResult) == null ? void 0 : _e.plugins) == null ? void 0 : _f.forEach((plugin) => {
+          this._player.unRegisterPlugin(plugin.pluginName);
+        });
+      }
       this._previousPrepareResult = result;
       if (result == null ? void 0 : result.options) {
         this._player.setConfig(result.options);
       }
       return {
-        plugins: addedPlugins.map((plugin) => {
+        plugins: isSameProtocol ? [] : (_g = result == null ? void 0 : result.plugins) == null ? void 0 : _g.map((plugin) => {
           return this._player.registerPlugin(plugin);
         }),
-        options: result == null ? void 0 : result.options
+        options: result == null ? void 0 : result.options,
+        isSameProtocol,
+        useSrc: result == null ? void 0 : result.useSrc
       };
     }
     async _handleFallback(err) {
@@ -14255,81 +14257,105 @@ var __publicField = (obj, key, value) => {
     async _switch(targetDefinition) {
       var _a, _b, _c, _d, _e, _f;
       const preDefinition = clonedeep(this._sourceManager.definition);
-      const { plugins: newPlugins, options } = await this.prepare(targetDefinition.url) || {};
+      const isPaused = this._player.paused && !this._player.isError;
+      const {
+        plugins: newPlugins,
+        options,
+        isSameProtocol,
+        useSrc
+      } = await this.prepare(targetDefinition.url) || {};
       if (options == null ? void 0 : options.url) {
         targetDefinition.url = options == null ? void 0 : options.url;
       }
       this._sourceManager.switch(targetDefinition);
       (_b = (_a = this._player) == null ? void 0 : _a.plugins) == null ? void 0 : _b.sources.renderItemList();
       (_d = (_c = this._player) == null ? void 0 : _c.plugins) == null ? void 0 : _d.definition.renderItemList();
-      if (((_e = targetDefinition == null ? void 0 : targetDefinition.source) == null ? void 0 : _e.name) !== ((_f = preDefinition == null ? void 0 : preDefinition.source) == null ? void 0 : _f.name)) {
-        this.emit(Events.SOURCE_CHANGE);
-      }
-      if (newPlugins == null ? void 0 : newPlugins.length) {
-        this.emit(Events.DEFINITION_CHANGE);
-        await this._callBeforePlayerInitForUrl(newPlugins, targetDefinition.url);
-        this.emit(Events.AFTER_DEFINITION_CHANGE);
+      const isSourceSwitching = ((_e = targetDefinition == null ? void 0 : targetDefinition.source) == null ? void 0 : _e.name) !== ((_f = preDefinition == null ? void 0 : preDefinition.source) == null ? void 0 : _f.name);
+      this._player.config.url = targetDefinition.url;
+      if (isSameProtocol) {
+        if (isSourceSwitching) {
+          this.emit(Events.SOURCE_CHANGE);
+          this._player.switchURL(targetDefinition.url);
+        } else {
+          this._player.changeDefinition(targetDefinition, preDefinition);
+        }
       } else {
-        this._player.changeDefinition(targetDefinition, preDefinition);
+        this.emit(
+          isSourceSwitching ? Events.SOURCE_CHANGE : Events.DEFINITION_CHANGE
+        );
+        await this._switchDifferentProtocolUrl(
+          newPlugins,
+          targetDefinition.url,
+          isPaused,
+          useSrc
+        );
+        !isSourceSwitching && this.emit(Events.AFTER_DEFINITION_CHANGE);
       }
     }
+    async _switchDifferentProtocolUrl(plugins, url, isPaused, useSrc) {
+      var _a, _b;
+      if (useSrc && this._player.media) {
+        if ((_a = this._player.config) == null ? void 0 : _a.preProcessUrl) {
+          url = (_b = this._player.config) == null ? void 0 : _b.preProcessUrl(url).url;
+        }
+        this._player.media.src = url;
+      }
+      if (plugins == null ? void 0 : plugins.length) {
+        await this._callBeforePlayerInitForUrl(plugins);
+      }
+      return new Promise((resolve) => {
+        const curTime = this._player.currentTime;
+        const _canplay = () => {
+          console.log("canplay canplay");
+          this._player.currentTime = curTime;
+          if (isPaused) {
+            this._player.once(CANPLAY, () => {
+              this._player.pause();
+            });
+          }
+          resolve();
+        };
+        if (sniffer.os.isAndroid) {
+          this.once(TIME_UPDATE, () => {
+            _canplay();
+          });
+        } else {
+          this.once(CANPLAY, () => {
+            _canplay();
+          });
+        }
+        this._player.play();
+      });
+    }
     async _switchUrl(url, config) {
-      const { plugins: newPlugins, options } = await this.prepare(url) || {};
+      const isPaused = this._player.paused && !this._player.isError;
+      const {
+        plugins: newPlugins,
+        options,
+        isSameProtocol,
+        useSrc
+      } = await this.prepare(url) || {};
       const newUrl = (options == null ? void 0 : options.url) ?? url;
       this._sourceManager.url = newUrl;
-      if (newPlugins == null ? void 0 : newPlugins.length) {
-        this._callBeforePlayerInitForUrl(newPlugins, newUrl);
-      } else {
+      this._player.config.url = newUrl;
+      if (isSameProtocol) {
         const res = this._player.switchURL(newUrl, {
           seamless: config == null ? void 0 : config.seamless
         });
-        const curTime = this._player.currentTime;
         if (res && res.then) {
           return res;
-        } else {
-          return new Promise((resolve) => {
-            const isPaused = this._player.paused && !this._player.isError;
-            const _canplay = () => {
-              this._player.currentTime = curTime;
-              if (isPaused) {
-                this._player.once(CANPLAY, () => {
-                  this._player.pause();
-                });
-              }
-              resolve();
-            };
-            if (sniffer.os.isAndroid) {
-              this.once(TIME_UPDATE, () => {
-                _canplay();
-              });
-            } else {
-              this.once(CANPLAY, () => {
-                _canplay();
-              });
-            }
-            this._player.play();
-          });
         }
+      } else {
+        return this._switchDifferentProtocolUrl(
+          newPlugins,
+          newUrl,
+          isPaused,
+          useSrc
+        );
       }
     }
-    // 获取需要卸载和需要注册的播放插件
-    _diffPlugins(previousPlugins, newPlugins) {
-      const previousPluginNames = previousPlugins.map((item) => item.pluginName);
-      const newPluginNames = newPlugins.map((item) => item.pluginName);
-      const removedPlugins = previousPluginNames.filter(
-        (name) => !newPluginNames.includes(name)
-      );
-      const addedPlugins = newPlugins.filter(
-        (name) => !previousPluginNames.includes(name.pluginName)
-      );
-      return {
-        removedPlugins,
-        addedPlugins
-      };
-    }
-    _callBeforePlayerInitForUrl(newPlugins, url) {
+    _callBeforePlayerInitForUrl(newPlugins) {
       return new Promise((resolve) => {
-        this._player.config.url = url;
         newPlugins == null ? void 0 : newPlugins.forEach((plugin) => {
           plugin.beforePlayerInit();
         });