@volcengine/veplayer-plugin 2.8.1 → 2.9.0-rc.0

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

@@ -3831,7 +3831,8 @@ var MSE = /* @__PURE__ */ function() {
     key: "isSupported",
     value: function isSupported() {
       var mime = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 'video/mp4; codecs="avc1.42E01E,mp4a.40.2"';
-      var MediaSource2 = getMediaSource();
+      var preferMMS = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
+      var MediaSource2 = getMediaSource(preferMMS);
       if (!MediaSource2)
         return false;
       try {
@@ -4027,6 +4028,7 @@ var FetchLoader = /* @__PURE__ */ function(_EventEmitter) {
     _defineProperty$1(_assertThisInitialized$2(_this), "_running", false);
     _defineProperty$1(_assertThisInitialized$2(_this), "_logger", null);
     _defineProperty$1(_assertThisInitialized$2(_this), "_vid", "");
+    _defineProperty$1(_assertThisInitialized$2(_this), "_firtstByte", 0);
     _defineProperty$1(_assertThisInitialized$2(_this), "_onProcessMinLen", 0);
     _defineProperty$1(_assertThisInitialized$2(_this), "_onCancel", null);
     _defineProperty$1(_assertThisInitialized$2(_this), "_priOptions", null);
@@ -4036,7 +4038,7 @@ var FetchLoader = /* @__PURE__ */ function(_EventEmitter) {
     key: "load",
     value: function load(_ref) {
       var _this$_abortControlle, _this2 = this;
-      var url = _ref.url, vid = _ref.vid, timeout = _ref.timeout, responseType = _ref.responseType, onProgress = _ref.onProgress, index = _ref.index, onTimeout = _ref.onTimeout, onCancel = _ref.onCancel, range = _ref.range, transformResponse = _ref.transformResponse, request = _ref.request, params = _ref.params, logger2 = _ref.logger, method = _ref.method, headers = _ref.headers, body = _ref.body, mode = _ref.mode, credentials = _ref.credentials, cache = _ref.cache, redirect = _ref.redirect, referrer = _ref.referrer, referrerPolicy = _ref.referrerPolicy, onProcessMinLen = _ref.onProcessMinLen, priOptions = _ref.priOptions;
+      var url = _ref.url, vid = _ref.vid, timeout = _ref.timeout, responseType = _ref.responseType, onProgress = _ref.onProgress, index = _ref.index, onTimeout = _ref.onTimeout, onCancel = _ref.onCancel, range = _ref.range, transformResponse = _ref.transformResponse, request = _ref.request, params = _ref.params, logger2 = _ref.logger, method = _ref.method, headers = _ref.headers, body = _ref.body, mode = _ref.mode, credentials = _ref.credentials, cache = _ref.cache, redirect = _ref.redirect, referrer = _ref.referrer, referrerPolicy = _ref.referrerPolicy, onProcessMinLen = _ref.onProcessMinLen, priOptions = _ref.priOptions, streamRes = _ref.streamRes, firstMaxChunkSize = _ref.firstMaxChunkSize;
       this._logger = logger2;
       this._aborted = false;
       this._onProcessMinLen = onProcessMinLen;
@@ -4047,6 +4049,7 @@ var FetchLoader = /* @__PURE__ */ function(_EventEmitter) {
       this._range = range || [0, 0];
       this._vid = vid || url;
       this._priOptions = priOptions || {};
+      this._firstMaxChunkSize = firstMaxChunkSize;
       var init = {
         method,
         headers,
@@ -4094,7 +4097,10 @@ var FetchLoader = /* @__PURE__ */ function(_EventEmitter) {
       var startTime = Date.now();
       this._logger.debug("[fetch load start], index,", index, ",range,", range);
       return new Promise(function(resolve, reject) {
-        fetch(request || url, request ? void 0 : init).then(/* @__PURE__ */ function() {
+        var promise = streamRes ? new Promise(function(r) {
+          r(streamRes);
+        }) : fetch(request || url, request ? void 0 : init);
+        promise.then(/* @__PURE__ */ function() {
           var _ref2 = _asyncToGenerator(/* @__PURE__ */ _regeneratorRuntime().mark(function _callee(response) {
             var firstByteTime, data, costTime, speed;
             return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -4290,7 +4296,7 @@ var FetchLoader = /* @__PURE__ */ function(_EventEmitter) {
       var pump = /* @__PURE__ */ function() {
         var _ref3 = _asyncToGenerator(/* @__PURE__ */ _regeneratorRuntime().mark(function _callee3() {
           var _this3$_range;
-          var startRange, startByte, curLen, retData, temp, costTime, speed;
+          var startRange, startByte, curLen, retData, temp, tmp, _tmp, costTime, speed;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1)
               switch (_context3.prev = _context3.next) {
@@ -4369,6 +4375,20 @@ var FetchLoader = /* @__PURE__ */ function(_EventEmitter) {
                     retData = data.value;
                   }
                   if (retData && retData.byteLength > 0 || data.done) {
+                    if (_this3._firstMaxChunkSize) {
+                      if (!_this3._firtstByte) {
+                        _this3._firtstByte++;
+                        tmp = retData.slice(0, _this3._firstMaxChunkSize);
+                        _this3._cacheData = retData.slice(_this3._firstMaxChunkSize);
+                        retData = tmp;
+                      } else if (_this3._cacheData) {
+                        _tmp = new Uint8Array(_this3._cacheData.byteLength + retData.byteLength);
+                        _tmp.set(_this3._cacheData, 0);
+                        _tmp.set(retData, _this3._cacheData.byteLength);
+                        retData = _tmp;
+                        _this3._cacheData = null;
+                      }
+                    }
                     onProgress(retData, data.done, {
                       range: [_this3._range[0] + _this3._receivedLength - (retData ? retData.byteLength : 0), _this3._range[0] + _this3._receivedLength],
                       vid: _this3._vid,
@@ -4381,7 +4401,13 @@ var FetchLoader = /* @__PURE__ */ function(_EventEmitter) {
                     }, response);
                   }
                   if (!data.done) {
-                    pump();
+                    if (_this3._firstMaxChunkSize) {
+                      setTimeout(function() {
+                        pump();
+                      }, 0);
+                    } else {
+                      pump();
+                    }
                   } else {
                     costTime = Date.now() - st;
                     speed = calculateSpeed(_this3._receivedLength, costTime);
@@ -6058,7 +6084,7 @@ var AAC = /* @__PURE__ */ function() {
         objectType = 2;
         extensionSamplingIndex = samplingIndex;
       } else {
-        objectType = originObjectType === 2 || originObjectType === 5 ? originObjectType : 5;
+        objectType = 5;
         extensionSamplingIndex = samplingIndex;
         if (samplingIndex >= 6) {
           extensionSamplingIndex = samplingIndex - 3;
@@ -7589,8 +7615,10 @@ var FlvDemuxer = /* @__PURE__ */ function() {
           if (metaData.hasOwnProperty("duration")) {
             videoTrack.duration = metaData.duration * 1e3;
           }
-          if (metaData.hasOwnProperty("width") && metaData.hasOwnProperty("height")) {
+          if (!videoTrack.width && metaData.hasOwnProperty("width")) {
             videoTrack.width = metaData.width;
+          }
+          if (!videoTrack.height && metaData.hasOwnProperty("height")) {
             videoTrack.height = metaData.height;
           }
         }
@@ -10998,7 +11026,7 @@ var Flv = /* @__PURE__ */ function(_EventEmitter) {
   _createClass$4(Flv2, [{
     key: "version",
     get: function get() {
-      return "3.0.21-rc.21";
+      return "3.0.23-rc.6";
     }
   }, {
     key: "isLive",
@@ -11058,25 +11086,26 @@ var Flv = /* @__PURE__ */ function(_EventEmitter) {
     key: "load",
     value: function() {
       var _load = _asyncToGenerator$1(/* @__PURE__ */ _regeneratorRuntime$1().mark(function _callee4(url) {
-        var reuseMse, _args4 = arguments;
+        var reuseMse, streamRes, _args4 = arguments;
         return _regeneratorRuntime$1().wrap(function _callee4$(_context4) {
           while (1)
             switch (_context4.prev = _context4.next) {
               case 0:
                 reuseMse = _args4.length > 1 && _args4[1] !== void 0 ? _args4[1] : false;
+                streamRes = _args4.length > 2 ? _args4[2] : void 0;
                 if (this._bufferService) {
-                  _context4.next = 3;
+                  _context4.next = 4;
                   break;
                 }
                 return _context4.abrupt("return");
-              case 3:
-                _context4.next = 5;
+              case 4:
+                _context4.next = 6;
                 return this._reset(reuseMse);
-              case 5:
-                this._loadData(url, this._opts.isLive ? [] : [0, this._opts.defaultVodLoadSize]);
+              case 6:
+                this._loadData(url, this._opts.isLive ? [] : [0, this._opts.defaultVodLoadSize], streamRes);
                 clearTimeout(this._tickTimer);
                 this._tickTimer = setTimeout(this._tick, this._tickInterval);
-              case 8:
+              case 9:
               case "end":
                 return _context4.stop();
             }
@@ -11311,7 +11340,7 @@ var Flv = /* @__PURE__ */ function(_EventEmitter) {
   }, {
     key: "_loadData",
     value: function() {
-      var _loadData2 = _asyncToGenerator$1(/* @__PURE__ */ _regeneratorRuntime$1().mark(function _callee10(url, range) {
+      var _loadData2 = _asyncToGenerator$1(/* @__PURE__ */ _regeneratorRuntime$1().mark(function _callee10(url, range, streamRes) {
         var finnalUrl;
         return _regeneratorRuntime$1().wrap(function _callee10$(_context10) {
           while (1)
@@ -11347,7 +11376,9 @@ var Flv = /* @__PURE__ */ function(_EventEmitter) {
                 _context10.next = 15;
                 return this._mediaLoader.load({
                   url: finnalUrl,
-                  range
+                  range,
+                  streamRes,
+                  firstMaxChunkSize: this._opts.firstMaxChunkSize
                 });
               case 15:
                 _context10.next = 21;
@@ -11363,7 +11394,7 @@ var Flv = /* @__PURE__ */ function(_EventEmitter) {
             }
         }, _callee10, this, [[12, 17]]);
       }));
-      function _loadData(_x9, _x10) {
+      function _loadData(_x9, _x10, _x11) {
         return _loadData2.apply(this, arguments);
       }
       return _loadData;
@@ -11529,6 +11560,12 @@ var FlvPlugin$1 = /* @__PURE__ */ function(_BasePlugin) {
       var _this$flv;
       return (_this$flv = _this.flv) === null || _this$flv === void 0 ? void 0 : _this$flv.getStats();
     });
+    _defineProperty$3(_assertThisInitialized$3(_this), "loadSource", function() {
+      var _this$flv2;
+      arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : _this.player.config.url;
+      var streamRes = arguments.length > 1 ? arguments[1] : void 0;
+      (_this$flv2 = _this.flv) === null || _this$flv2 === void 0 ? void 0 : _this$flv2.load(_this.player.config.url, true, streamRes);
+    });
     _defineProperty$3(_assertThisInitialized$3(_this), "destroy", function() {
       var _this$pluginExtension;
       if (_this.flv) {
@@ -11574,8 +11611,8 @@ var FlvPlugin$1 = /* @__PURE__ */ function(_BasePlugin) {
   }, {
     key: "version",
     get: function get() {
-      var _this$flv2;
-      return (_this$flv2 = this.flv) === null || _this$flv2 === void 0 ? void 0 : _this$flv2.version;
+      var _this$flv3;
+      return (_this$flv3 = this.flv) === null || _this$flv3 === void 0 ? void 0 : _this$flv3.version;
     }
   }, {
     key: "softDecode",
@@ -11587,8 +11624,8 @@ var FlvPlugin$1 = /* @__PURE__ */ function(_BasePlugin) {
   }, {
     key: "loader",
     get: function get() {
-      var _this$flv3;
-      return (_this$flv3 = this.flv) === null || _this$flv3 === void 0 ? void 0 : _this$flv3.loader;
+      var _this$flv4;
+      return (_this$flv4 = this.flv) === null || _this$flv4 === void 0 ? void 0 : _this$flv4.loader;
     }
   }, {
     key: "transferCost",
@@ -11675,7 +11712,9 @@ var FlvPlugin$1 = /* @__PURE__ */ function(_BasePlugin) {
       this._transCoreEvent(EVENT.STREAM_EXCEPTION);
       this._transCoreEvent(EVENT.SWITCH_URL_SUCCESS);
       this._transCoreEvent(EVENT.SWITCH_URL_FAILED);
-      this.flv.load(config.url, true);
+      if (!flvOpts.manualLoad) {
+        this.loadSource(config.url, flvOpts.streamRes);
+      }
     }
   }, {
     key: "_transError",