@byteplus/veplayer 2.3.1-rc.4 → 2.4.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byteplus/veplayer",
-  "version": "2.3.1-rc.4",
+  "version": "2.4.0-rc.0",
   "main": "./umd/veplayer.production.js",
   "module": "./esm/veplayer.production.js",
   "browser": "./umd/veplayer.production.js",

package/umd/index.d.ts

@@ -2164,11 +2164,11 @@ declare enum DynamicModule {
     PluginFlv = "plugin:flv",
     PluginMp4 = "plugin:mp4",
     PluginHls = "plugin:hls",
-    PluginHlsJs = "plugin:hlsjs",
     PluginShaka = "plugin:shaka",
     PluginRtm = "plugin:rtm",
     PluginXgvideo = "plugin:xgvideo",
-    PluginDrm = "plugin:drm"
+    PluginDrm = "plugin:drm",
+    PluginAbr = "plugin:abr"
 }
 type ModulesMap = {
     [DynamicModule.BizVod]: Exports;
@@ -2176,11 +2176,11 @@ type ModulesMap = {
     [DynamicModule.PluginFlv]: Exports;
     [DynamicModule.PluginMp4]: Exports;
     [DynamicModule.PluginHls]: Exports;
-    [DynamicModule.PluginHlsJs]: Exports;
     [DynamicModule.PluginShaka]: Exports;
     [DynamicModule.PluginRtm]: Exports;
     [DynamicModule.PluginXgvideo]: Exports;
     [DynamicModule.PluginDrm]: Exports;
+    [DynamicModule.PluginAbr]: Exports;
 };
 declare const register: (exports: {
     [x: string]: any;
@@ -3896,11 +3896,11 @@ declare namespace strategy {
         readonly "plugin:flv": "veplayer.plugin.flv.[env].[ext]";
         readonly "plugin:mp4": "veplayer.plugin.mp4.[env].[ext]";
         readonly "plugin:hls": "veplayer.plugin.hls.[env].[ext]";
-        readonly "plugin:hlsjs": "veplayer.plugin.hlsjs.[env].[ext]";
         readonly "plugin:shaka": "veplayer.plugin.shaka.[env].[ext]";
         readonly "plugin:rtm": "veplayer.plugin.rtm.[env].[ext]";
         readonly "plugin:xgvideo": "veplayer.plugin.xgvideo.[env].[ext]";
         readonly "plugin:drm": "veplayer.plugin.drm.[env].[ext]";
+        readonly "plugin:abr": "veplayer.plugin.abr.[env].[ext]";
     };
     const enum State {
         Fetching = 0,
@@ -3927,11 +3927,11 @@ declare namespace strategy {
         PluginFlv = "plugin:flv",
         PluginMp4 = "plugin:mp4",
         PluginHls = "plugin:hls",
-        PluginHlsJs = "plugin:hlsjs",
         PluginShaka = "plugin:shaka",
         PluginRtm = "plugin:rtm",
         PluginXgvideo = "plugin:xgvideo",
-        PluginDrm = "plugin:drm"
+        PluginDrm = "plugin:drm",
+        PluginAbr = "plugin:abr"
     }
     type ModulesMap = {
         [DynamicModule.BizVod]: Exports;
@@ -3939,11 +3939,11 @@ declare namespace strategy {
         [DynamicModule.PluginFlv]: Exports;
         [DynamicModule.PluginMp4]: Exports;
         [DynamicModule.PluginHls]: Exports;
-        [DynamicModule.PluginHlsJs]: Exports;
         [DynamicModule.PluginShaka]: Exports;
         [DynamicModule.PluginRtm]: Exports;
         [DynamicModule.PluginXgvideo]: Exports;
         [DynamicModule.PluginDrm]: Exports;
+        [DynamicModule.PluginAbr]: Exports;
     };
     class Loader {
         readonly modules: Record<string, Module>;
@@ -3981,7 +3981,7 @@ declare namespace strategy {
     }
     type StrategyCreator<T, R extends keyof ModulesMap = any> = (options?: T) => Strategy<T, R>;
     const createFlvMseStrategy: StrategyCreator<VePlayerBaseOptions, DynamicModule.PluginFlv>;
-    const createHlsMseStrategy: StrategyCreator<VePlayerBaseOptions, DynamicModule.PluginHls | DynamicModule.PluginHlsJs>;
+    const createHlsMseStrategy: StrategyCreator<VePlayerBaseOptions, DynamicModule.PluginHls>;
     const createSoftDecodeH264Strategy: StrategyCreator<VePlayerBaseOptions, DynamicModule.PluginXgvideo>;
     const createSoftDecodeH265Strategy: StrategyCreator<VePlayerBaseOptions, DynamicModule.PluginXgvideo>;
     function getCodec(options: VePlayerBaseOptions): Promise<"unknown" | Codec>;
@@ -4607,6 +4607,9 @@ declare namespace event {
         AUTOPLAY_SUCCESS: string;
         ERROR_REFRESH_CLICK: string;
         SOURCE_CHANGE: string;
+        SWITCH_DEFINITION_START: string;
+        SWITCH_DEFINITION_SUCCESS: string;
+        DOWN_DEFINITION: string;
     };
     const Events: {
         SEI: string;
@@ -4632,6 +4635,9 @@ declare namespace event {
         AUTOPLAY_SUCCESS: string;
         ERROR_REFRESH_CLICK: string;
         SOURCE_CHANGE: string;
+        SWITCH_DEFINITION_START: string;
+        SWITCH_DEFINITION_SUCCESS: string;
+        DOWN_DEFINITION: string;
         REPLAY: string;
         ERROR: string;
         PLAY: string;
@@ -4663,6 +4669,9 @@ declare namespace event {
         COMPLETE: string;
         DESTROY: string;
         URL_CHANGE: string;
+        LEAVE_PLAYER: string;
+        ENTER_PLAYER: string;
+        LOADING: string;
         SEI_PARSED: string;
         RETRY: string;
         ROTATE: string;

package/umd/veplayer.biz.live.development.js

@@ -32,27 +32,27 @@ var __publicField = (obj, key, value) => {
   function create(errorCode, i18n) {
     return new VeError(ERRORS[errorCode], i18n);
   }
-  const DynamicModule$3 = window["VePlayer"].DynamicModule;
-  const load$3 = window["VePlayer"].load;
+  const DynamicModule$4 = window["VePlayer"].DynamicModule;
+  const load$4 = window["VePlayer"].load;
   async function isRTMSupported() {
-    const { RtmPlugin } = await load$3(DynamicModule$3.PluginRtm);
+    const { RtmPlugin } = await load$4(DynamicModule$4.PluginRtm);
     return RtmPlugin.isSupported();
   }
   async function isRTMSupportCodec(codec = RTMCodec.H264) {
-    const { RtmPlugin } = await load$3(DynamicModule$3.PluginRtm);
+    const { RtmPlugin } = await load$4(DynamicModule$4.PluginRtm);
     if (codec === RTMCodec.H264)
       return RtmPlugin.isSupportedH264();
     return false;
   }
   const strategy$1 = window["VePlayer"].strategy;
   const util$4 = window["VePlayer"].util;
-  const DynamicModule$2 = window["VePlayer"].DynamicModule;
-  const load$2 = window["VePlayer"].load;
+  const DynamicModule$3 = window["VePlayer"].DynamicModule;
+  const load$3 = window["VePlayer"].load;
   const Codec$1 = window["VePlayer"].Codec;
   const Sniffer$3 = window["VePlayer"].Sniffer;
   const rtmStrategy = {
     options: {},
-    module: DynamicModule$2.PluginRtm
+    module: DynamicModule$3.PluginRtm
   };
   const generateFallbackUrl = (url) => {
     if (Sniffer$3.device === "pc") {
@@ -79,13 +79,13 @@ var __publicField = (obj, key, value) => {
       backupStrategy = strategy$1.createHlsMseStrategy(options);
     }
     const [rtmCdn, backupCdn] = await Promise.all([
-      load$2(rtmStrategy.module).then((module2) => {
+      load$3(rtmStrategy.module).then((module2) => {
         return module2.RtmPlugin;
       }).catch(() => void 0),
-      backupStrategy && load$2(backupStrategy.module).then((module2) => {
-        if ((backupStrategy == null ? void 0 : backupStrategy.module) === DynamicModule$2.PluginFlv) {
+      backupStrategy && load$3(backupStrategy.module).then((module2) => {
+        if ((backupStrategy == null ? void 0 : backupStrategy.module) === DynamicModule$3.PluginFlv) {
           return module2.FlvPlugin;
-        } else if ((backupStrategy == null ? void 0 : backupStrategy.module) === DynamicModule$2.PluginHls || (backupStrategy == null ? void 0 : backupStrategy.module) === DynamicModule$2.PluginHlsJs) {
+        } else if ((backupStrategy == null ? void 0 : backupStrategy.module) === DynamicModule$3.PluginHls) {
           return module2.HlsPlugin;
         }
       }).catch(() => void 0)
@@ -2935,8 +2935,8 @@ var __publicField = (obj, key, value) => {
         device_id: this._deviceId,
         ext: {
           veplayer_version: "2.3.1-rc.2",
-          flv_version: "3.0.15-alpha.2",
-          hls_version: "3.0.12",
+          flv_version: "3.0.17",
+          hls_version: "3.0.17",
           rts_version: "0.2.0-alpha.5"
         }
       });
@@ -3205,8 +3205,8 @@ var __publicField = (obj, key, value) => {
     DECODE_INFO: "软解信息",
     REFRESH: "刷新"
   };
-  const DynamicModule$1 = window["VePlayer"].DynamicModule;
-  const load$1 = window["VePlayer"].load;
+  const DynamicModule$2 = window["VePlayer"].DynamicModule;
+  const load$2 = window["VePlayer"].load;
   const getDrmStrategy = async (options, player) => {
     var _a;
     const drmType = getDrmType(options.drm);
@@ -3214,7 +3214,7 @@ var __publicField = (obj, key, value) => {
       try {
         const { getDrmConfig, ...originFairplayConfig } = ((_a = options == null ? void 0 : options.drm) == null ? void 0 : _a.fairplay) ?? {};
         const [drmPlugin, drmConfig] = await Promise.all([
-          load$1(DynamicModule$1.PluginDrm).then((module2) => module2.DrmPlugin).catch(() => void 0),
+          load$2(DynamicModule$2.PluginDrm).then((module2) => module2.DrmPlugin).catch(() => void 0),
           getDrmConfig == null ? void 0 : getDrmConfig({
             url: options.url
           })
@@ -3238,6 +3238,55 @@ var __publicField = (obj, key, value) => {
     }
     return {};
   };
+  function isType(suffix) {
+    return function(url) {
+      return url == null ? void 0 : url.split("?")[0].toLowerCase().includes(suffix);
+    };
+  }
+  const isHls = isType(".m3u8");
+  const isMp4 = isType(".mp4");
+  const isFlv = isType(".flv");
+  const isRtm = isType(".sdp");
+  const isDash = isType(".mpd");
+  function getStreamType(url) {
+    if (isHls(url)) {
+      return "hls";
+    }
+    if (isFlv(url)) {
+      return "flv";
+    }
+    if (isRtm(url)) {
+      return "rtm";
+    }
+    if (isMp4(url)) {
+      return "mp4";
+    }
+    if (isDash(url)) {
+      return "dash";
+    }
+    return "unknown";
+  }
+  const DynamicModule$1 = window["VePlayer"].DynamicModule;
+  const load$1 = window["VePlayer"].load;
+  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$1(DynamicModule$1.PluginAbr).catch(() => void 0);
+    return {
+      options: {
+        [streamType === "flv" ? "abr" : "hlsabr"]: abrOptions
+      },
+      plugins: [
+        streamType === "flv" ? abrPlugin == null ? void 0 : abrPlugin.AbrPlugin : abrPlugin == null ? void 0 : abrPlugin.HlsAbrPlugin
+      ]
+    };
+  };
   const DEFAULT_PLUGINS = window["VePlayer"].DEFAULT_PLUGINS;
   const VePlayerBase = window["VePlayer"].VePlayerBase;
   const VeI18n = window["VePlayer"].VeI18n;
@@ -3313,6 +3362,14 @@ var __publicField = (obj, key, value) => {
       var _a;
       (_a = this._player.plugins) == null ? void 0 : _a.infopanel.close();
     }
+    openAbr() {
+      var _a, _b;
+      (_b = (_a = this._player.plugins) == null ? void 0 : _a.abr) == null ? void 0 : _b.switchAbr(true);
+    }
+    closeAbr() {
+      var _a, _b;
+      (_b = (_a = this._player.plugins) == null ? void 0 : _a.abr) == null ? void 0 : _b.switchAbr(false);
+    }
     /** {zh}
      * @brief 调用此方法更新 DRM 鉴权配置。
      * @hidden
@@ -3321,6 +3378,14 @@ var __publicField = (obj, key, value) => {
       var _a, _b, _c;
       (_c = (_b = (_a = this._player) == null ? void 0 : _a.plugins) == null ? void 0 : _b.drm) == null ? void 0 : _c.updateDrmConfig(config);
     }
+    async switch(target, options) {
+      var _a, _b, _c;
+      const { abr, ...rest } = options ?? {};
+      if (abr) {
+        (_c = (_b = (_a = this._player) == null ? void 0 : _a.plugins) == null ? void 0 : _b.abr) == null ? void 0 : _c.updateConfig(abr);
+      }
+      return super.switch(target, rest);
+    }
   }
   async function createLivePlayer(options) {
     var _a, _b;
@@ -3345,15 +3410,21 @@ var __publicField = (obj, key, value) => {
           };
         },
         async preparePlugins(url) {
-          const [typeStrategy, drmStrategy] = await Promise.all([
+          const [typeStrategy, drmStrategy, abrStrategy] = await Promise.all([
             getTypeStrategy({ ...finalOptions, url }, player),
-            getDrmStrategy({ ...finalOptions, url }, player)
+            getDrmStrategy({ ...finalOptions, url }, player),
+            getAbrStrategy({ ...finalOptions, url })
           ]);
           const { options: options2, plugins } = typeStrategy ?? {};
           const { options: drmOptions, plugins: drmPlugins } = drmStrategy ?? {};
+          const { options: abrOptions, plugins: abrPlugins } = abrStrategy ?? {};
           return {
-            options: Object.assign({}, options2, drmOptions),
-            plugins: [...plugins ?? [], ...drmPlugins ?? []]
+            options: Object.assign({}, options2, drmOptions, abrOptions),
+            plugins: [
+              ...plugins ?? [],
+              ...drmPlugins ?? [],
+              ...abrPlugins ?? []
+            ]
           };
         }
       },