@byteplus/veplayer-plugin 2.4.0-rc.1 → 2.4.0-rc.3

package/package.json

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

package/umd/veplayer.plugin.flv.development.js

@@ -5043,11 +5043,19 @@
     }]);
     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$2(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$2(BandwidthService2, [{
       key: "addRecord",
@@ -5055,45 +5063,82 @@
         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;
@@ -5222,13 +5267,15 @@
     _createClass$2(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
         });
       }
@@ -10028,7 +10075,10 @@
       onlyAudio: false,
       preferMMS: false,
       mseLowLatency: true,
-      durationForMSELowLatencyOff: 6
+      durationForMSELowLatencyOff: 6,
+      chunkCountForSpeed: 50,
+      skipChunkSize: 1e3,
+      longtimeNoReceived: 3e3
     }, opts);
     if (ret.isLive) {
       if (ret.preloadTime) {
@@ -10186,7 +10236,7 @@
                   return _context.abrupt("return");
                 case 40:
                   maxReaderInterval = _this._opts.maxReaderInterval;
-                  if (maxReaderInterval) {
+                  if (maxReaderInterval && _this._firstProgressEmit) {
                     clearTimeout(_this._maxChunkWaitTimer);
                     _this._maxChunkWaitTimer = setTimeout(function() {
                       if (_this._disconnectRetryCount) {
@@ -10398,7 +10448,11 @@
       _this._disconnectRetryCount = _this._opts.disconnectRetryCount;
       _this._bufferService = new BufferService(_assertThisInitialized$3(_this), _this._opts.softDecode ? _this.media : void 0, _this._opts);
       _this._seiService = new SeiService(_assertThisInitialized$3(_this));
-      _this._bandwidthService = new BandwidthService();
+      _this._bandwidthService = new BandwidthService({
+        chunkCountForSpeed: _this._opts.chunkCountForSpeed,
+        skipChunkSize: _this._opts.skipChunkSize,
+        longtimeNoReceived: _this._opts.longtimeNoReceived
+      });
       _this._stats = new MediaStatsService(_assertThisInitialized$3(_this));
       if (!_this._opts.softDecode) {
         _this._gapService = new GapService();
@@ -10415,7 +10469,7 @@
     _createClass$4(Flv2, [{
       key: "version",
       get: function get() {
-        return "3.0.17";
+        return "3.0.18-alpha.5";
       }
     }, {
       key: "isLive",
@@ -10449,7 +10503,9 @@
       value: function speedInfo() {
         return {
           speed: this._bandwidthService.getLatestSpeed(),
-          avgSpeed: this._bandwidthService.getAvgSpeed()
+          avgSpeed: this._bandwidthService.getAvgSpeed(),
+          totalSize: this._bandwidthService.getTotalSize(),
+          totalCost: this._bandwidthService.getTotalCost()
         };
       }
     }, {
@@ -10739,7 +10795,7 @@
                   _context9.prev = 17;
                   _context9.t0 = _context9["catch"](12);
                   this._loading = false;
-                  return _context9.abrupt("return", this._emitError(StreamingError.network(_context9.t0)));
+                  return _context9.abrupt("return", this._emitError(StreamingError.network(_context9.t0), false));
                 case 21:
                 case "end":
                   return _context9.stop();