@byteplus/veplayer-plugin 2.4.0-rc.2 → 2.4.0-rc.4

package/esm/veplayer.plugin.hls.development.js

@@ -1640,7 +1640,7 @@ util.getCurrentTimeByOffset = function(offsetTime, segments) {
   }
   return offsetTime;
 };
-var version = "3.0.17";
+var version = "3.0.19-rc.0";
 var ERROR_MAP = {
   1: 5101,
   2: 5102,
@@ -2889,6 +2889,7 @@ var ERR = {
     MSE_APPEND_BUFFER: "MSE_APPEND_BUFFER",
     MSE_OTHER: "MSE_OTHER",
     MSE_FULL: "MSE_FULL",
+    MSE_CHANGE_TYPE: "MSE_CHANGE_TYPE",
     OPTION: "OPTION",
     DASH: "DASH",
     LICENSE: "LICENSE",
@@ -2931,6 +2932,7 @@ var ERR_CODE = (_ERR_CODE = {}, _defineProperty$1(_ERR_CODE, ERR.MANIFEST, {
   MSE_OTHER: 5202,
   MSE_FULL: 5203,
   MSE_HIJACK: 5204,
+  MSE_CHANGE_TYPE: 5205,
   EME_HIJACK: 5301
 }), _defineProperty$1(_ERR_CODE, ERR.DRM, {
   LICENSE: 7100,
@@ -3266,7 +3268,7 @@ var MSE = /* @__PURE__ */ function() {
           queue.shift();
         }
         if (op) {
-          var _this2$_sourceBuffer$;
+          var _this2$_sourceBuffer$, _op$context;
           var costtime = nowTime() - _this2._opst;
           _this2._logger.debug("UpdateEnd(".concat(type, "/").concat(op.opName, ")"), SafeJSON.stringify(getTimeRanges((_this2$_sourceBuffer$ = _this2._sourceBuffer[type]) === null || _this2$_sourceBuffer$ === void 0 ? void 0 : _this2$_sourceBuffer$.buffered)), costtime, op.context);
           op.promise.resolve({
@@ -3274,6 +3276,10 @@ var MSE = /* @__PURE__ */ function() {
             context: op.context,
             costtime
           });
+          var callback = (_op$context = op.context) === null || _op$context === void 0 ? void 0 : _op$context.callback;
+          if (callback && typeof callback === "function") {
+            callback(op.context);
+          }
           _this2._startQueue(type);
         }
       }
@@ -3535,10 +3541,15 @@ var MSE = /* @__PURE__ */ function() {
       var sb = this._sourceBuffer[type];
       if (!this.mediaSource || !sb || sb.mimeType === mimeType)
         return Promise.resolve();
-      if (typeof sb.changeType !== "function")
-        return Promise.reject();
+      if (typeof sb.changeType !== "function") {
+        return Promise.reject(new StreamingError(ERR.MEDIA, ERR.SUB_TYPES.MSE_CHANGE_TYPE, new Error("changeType is not a function")));
+      }
       return this._enqueueOp(type, function() {
-        sb.changeType(mimeType);
+        try {
+          sb.changeType(mimeType);
+        } catch (e) {
+          throw new StreamingError(ERR.MEDIA, ERR.SUB_TYPES.MSE_CHANGE_TYPE, e);
+        }
         sb.mimeType = mimeType;
         _this8._onSBUpdateEnd(type);
       }, "changeType", {
@@ -3788,11 +3799,14 @@ var MSE = /* @__PURE__ */ function() {
           } catch (error) {
             if (error && error.message && error.message.indexOf("SourceBuffer is full") >= 0) {
               this._mseFullFlag[type] = true;
+              if (op.context && _typeof(op.context) === "object") {
+                op.context.isFull = true;
+              }
               this._logger.error("[MSE error],  context,", op.context, " ,name,", op.opName, ",err,SourceBuffer is full");
               op.promise.reject(new StreamingError(ERR.MEDIA, ERR.SUB_TYPES.MSE_FULL, error));
             } else {
               this._logger.error(error);
-              op.promise.reject(new StreamingError(ERR.MEDIA, ERR.SUB_TYPES.MSE_OTHER, error));
+              op.promise.reject(error.constructor === StreamingError ? error : new StreamingError(ERR.MEDIA, ERR.SUB_TYPES.MSE_OTHER, error));
               queue.shift();
               this._startQueue(type);
             }
@@ -5142,11 +5156,19 @@ var SeiService = /* @__PURE__ */ function() {
   }]);
   return SeiService2;
 }();
+var SKIP_SMALL_CHUNK = 1e3;
+var MAX_CHUNK_SAVE_SIZE = 50;
+var MAX_SEGMENT_SAVE_SIZE = 3;
+var LONGTIME_NO_RECEIVE = 3e3;
 var BandwidthService = /* @__PURE__ */ function() {
-  function BandwidthService2() {
+  function BandwidthService2(opts) {
     _classCallCheck$1(this, BandwidthService2);
-    _defineProperty$1(this, "_chunkSpeeds", []);
+    _defineProperty$1(this, "_chunkSpeed", 0);
+    _defineProperty$1(this, "_chunkCache", []);
     _defineProperty$1(this, "_speeds", []);
+    _defineProperty$1(this, "_totalSize", 0);
+    _defineProperty$1(this, "_totalCost", 0);
+    this._opts = opts || {};
   }
   _createClass$1(BandwidthService2, [{
     key: "addRecord",
@@ -5154,45 +5176,82 @@ var BandwidthService = /* @__PURE__ */ function() {
       if (!totalByte || !ms)
         return;
       this._speeds.push(8e3 * totalByte / ms);
-      this._speeds = this._speeds.slice(-3);
+      this._speeds = this._speeds.slice(-MAX_SEGMENT_SAVE_SIZE);
     }
   }, {
     key: "addChunkRecord",
     value: function addChunkRecord(totalByte, ms) {
-      if (!totalByte || !ms)
+      var _this$_opts, _this$_opts2;
+      if (!totalByte || !ms || totalByte < (((_this$_opts = this._opts) === null || _this$_opts === void 0 ? void 0 : _this$_opts.skipChunkSize) || SKIP_SMALL_CHUNK))
         return;
-      this._chunkSpeeds.push(8e3 * totalByte / ms);
-      this._chunkSpeeds = this._chunkSpeeds.slice(-100);
+      this._totalSize += totalByte;
+      this._totalCost += ms;
+      this._chunkSpeed = 8e3 * totalByte / ms;
+      this._chunkCache.push({
+        size: totalByte,
+        duration: ms,
+        timestamp: performance.now()
+      });
+      var size = ((_this$_opts2 = this._opts) === null || _this$_opts2 === void 0 ? void 0 : _this$_opts2.chunkCountForSpeed) || MAX_CHUNK_SAVE_SIZE;
+      if (this._chunkCache.length > size) {
+        this._chunkCache = this._chunkCache.slice(-size);
+      }
     }
   }, {
     key: "getAvgSpeed",
     value: function getAvgSpeed() {
-      if (!this._chunkSpeeds.length && !this._speeds.length)
+      var _this$_opts3;
+      if (!this._chunkCache.length && !this._speeds.length)
         return 0;
       if (this._speeds.length) {
         return this._speeds.reduce(function(a, c) {
           return a += c;
         }) / this._speeds.length;
       }
-      return this._chunkSpeeds.reduce(function(a, c) {
-        return a += c;
-      }) / this._chunkSpeeds.length;
+      var lastSample = this._chunkCache[this._chunkCache.length - 1];
+      var cost = performance.now() - lastSample.timestamp;
+      if (cost > (((_this$_opts3 = this._opts) === null || _this$_opts3 === void 0 ? void 0 : _this$_opts3.longtimeNoReceived) || LONGTIME_NO_RECEIVE)) {
+        this._chunkCache.push({
+          size: 0,
+          duration: cost,
+          timestamp: performance.now()
+        });
+      }
+      var totalSize = this._chunkCache.reduce(function(a, c) {
+        return a += c.size;
+      }, 0);
+      var totalDuration = this._chunkCache.reduce(function(a, c) {
+        return a += c.duration;
+      }, 0);
+      return 8e3 * totalSize / totalDuration;
     }
   }, {
     key: "getLatestSpeed",
     value: function getLatestSpeed() {
-      if (!this._chunkSpeeds.length && !this._speeds.length)
+      if (!this._chunkCache.length && !this._speeds.length)
         return 0;
       if (this._speeds.length) {
         return this._speeds[this._speeds.length - 1];
       }
-      return this._chunkSpeeds[this._chunkSpeeds.length - 1];
+      return this._chunkSpeed;
+    }
+  }, {
+    key: "getTotalSize",
+    value: function getTotalSize() {
+      return this._totalSize;
+    }
+  }, {
+    key: "getTotalCost",
+    value: function getTotalCost() {
+      return this._totalCost;
     }
   }, {
     key: "reset",
     value: function reset() {
-      this._chunkSpeeds = [];
+      this._chunkCache = [];
       this._speeds = [];
+      this._totalSize = 0;
+      this._totalCost = 0;
     }
   }]);
   return BandwidthService2;
@@ -5321,13 +5380,15 @@ var MediaStatsService = /* @__PURE__ */ function() {
   _createClass$1(MediaStatsService2, [{
     key: "getStats",
     value: function getStats() {
-      var _this$_core, _this$_core2, _this$_core2$speedInf, _this$_core3, _this$_core3$speedInf, _this$_core4, _this$_core4$bufferIn;
+      var _this$_core, _this$_core2, _this$_core2$speedInf, _this$_core3, _this$_core3$speedInf, _this$_core4, _this$_core4$speedInf, _this$_core5, _this$_core5$speedInf, _this$_core6, _this$_core6$bufferIn;
       var _ref2 = ((_this$_core = this._core) === null || _this$_core === void 0 ? void 0 : _this$_core.media) || {}, _ref2$currentTime = _ref2.currentTime, currentTime = _ref2$currentTime === void 0 ? 0 : _ref2$currentTime, _ref2$decodeFps = _ref2.decodeFps, decodeFps = _ref2$decodeFps === void 0 ? 0 : _ref2$decodeFps;
       return _objectSpread2(_objectSpread2({}, this._stats.getStats()), {}, {
         downloadSpeed: ((_this$_core2 = this._core) === null || _this$_core2 === void 0 ? void 0 : (_this$_core2$speedInf = _this$_core2.speedInfo) === null || _this$_core2$speedInf === void 0 ? void 0 : _this$_core2$speedInf.call(_this$_core2).speed) || 0,
         avgSpeed: ((_this$_core3 = this._core) === null || _this$_core3 === void 0 ? void 0 : (_this$_core3$speedInf = _this$_core3.speedInfo) === null || _this$_core3$speedInf === void 0 ? void 0 : _this$_core3$speedInf.call(_this$_core3).avgSpeed) || 0,
+        totalReceivedByte: ((_this$_core4 = this._core) === null || _this$_core4 === void 0 ? void 0 : (_this$_core4$speedInf = _this$_core4.speedInfo) === null || _this$_core4$speedInf === void 0 ? void 0 : _this$_core4$speedInf.call(_this$_core4).totalSize) || 0,
+        totalReceivedCost: ((_this$_core5 = this._core) === null || _this$_core5 === void 0 ? void 0 : (_this$_core5$speedInf = _this$_core5.speedInfo) === null || _this$_core5$speedInf === void 0 ? void 0 : _this$_core5$speedInf.call(_this$_core5).totalCost) || 0,
         currentTime,
-        bufferEnd: ((_this$_core4 = this._core) === null || _this$_core4 === void 0 ? void 0 : (_this$_core4$bufferIn = _this$_core4.bufferInfo()) === null || _this$_core4$bufferIn === void 0 ? void 0 : _this$_core4$bufferIn.remaining) || 0,
+        bufferEnd: ((_this$_core6 = this._core) === null || _this$_core6 === void 0 ? void 0 : (_this$_core6$bufferIn = _this$_core6.bufferInfo()) === null || _this$_core6$bufferIn === void 0 ? void 0 : _this$_core6$bufferIn.remaining) || 0,
         decodeFps
       });
     }
@@ -11203,7 +11264,9 @@ var BufferService = /* @__PURE__ */ function() {
                 mse = this._mse;
                 _p = [];
                 if (needInit && !isFirstAppend) {
-                  this._handleCodecChange(video, audio);
+                  this._handleCodecChange(video, audio).forEach(function(task) {
+                    return _p.push(task);
+                  });
                 }
                 if (video) {
                   videoData = video.data, videoRest = _objectWithoutProperties$1(video, _excluded);
@@ -11476,6 +11539,7 @@ var BufferService = /* @__PURE__ */ function() {
   }, {
     key: "_handleCodecChange",
     value: function _handleCodecChange(video, audio) {
+      var tasks = [];
       var mse = this._mse;
       var codecList = [{
         type: MSE.VIDEO,
@@ -11492,10 +11556,11 @@ var BufferService = /* @__PURE__ */ function() {
         if (sourceBuffer) {
           var codec = codecs.split(",")[0];
           if (!new RegExp(codec, "ig").test(sourceBuffer.mimeType)) {
-            mse.changeType(type, "".concat(type, "/mp4;codecs=").concat(codecs));
+            tasks.push(mse.changeType(type, "".concat(type, "/mp4;codecs=").concat(codecs)));
           }
         }
       });
+      return tasks;
     }
   }, {
     key: "seamlessSwitch",
@@ -11554,10 +11619,21 @@ var MediaType = {
 };
 var KeySystems = {
   CLEAR_KEY: "org.w3.clearkey",
-  FAIRPLAY: "com.apple.streamingkeydelivery",
-  WIDEVINE: "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed",
-  PLAYREADY: "com.microsoft.playready"
+  FAIRPLAY: ["urn:uuid:94ce86fb-07ff-4f43-adb8-93d2fa968ca2", "com.apple.streamingkeydelivery"],
+  WIDEVINE: ["urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed", "com.widevine.alpha", "com.widevine"],
+  PLAYREADY: ["urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95", "com.microsoft.playready"]
 };
+function flatArray(arr) {
+  var ret = [];
+  for (var i = 0; i < arr.length; i++) {
+    if (Array.isArray(arr[i])) {
+      ret = ret.concat(flatArray(arr[i]));
+    } else {
+      ret.push(arr[i]);
+    }
+  }
+  return ret;
+}
 var MediaStream = /* @__PURE__ */ _createClass$3(function MediaStream2() {
   _classCallCheck$3(this, MediaStream2);
   _defineProperty$3(this, "id", 0);
@@ -11734,7 +11810,7 @@ var MediaSegmentKey = /* @__PURE__ */ function() {
   }, {
     key: "isValidKeySystem",
     value: function isValidKeySystem() {
-      var isKeyFormatValid = [KeySystems.CLEAR_KEY, KeySystems.FAIRPLAY, KeySystems.WIDEVINE, KeySystems.PLAYREADY].indexOf(this.keyFormat) > -1;
+      var isKeyFormatValid = flatArray([KeySystems.CLEAR_KEY, KeySystems.FAIRPLAY, KeySystems.WIDEVINE, KeySystems.PLAYREADY]).indexOf(this.keyFormat) > -1;
       if (!isKeyFormatValid) {
         return false;
       }
@@ -14519,7 +14595,7 @@ var Hls = /* @__PURE__ */ function(_EventEmitter) {
   }]);
   return Hls2;
 }(EventEmitter);
-_defineProperty$3(Hls, "version", "3.0.17");
+_defineProperty$3(Hls, "version", "3.0.19-rc.0");
 try {
   if (localStorage.getItem("xgd")) {
     Hls.enableLogger();