@byteplus/veplayer-plugin 2.3.0 → 2.3.1-rc.1

package/package.json

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

package/umd/index.d.ts

@@ -1,6 +1,7 @@
 export const flv: any;
 export const mp4: any;
 export const hls: any;
+export const hlsjs: any;
 export const rtm: any;
 export const shaka: any;
 export const xgvideo: any;

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

@@ -3089,12 +3089,19 @@
     return result;
   }
   function getMediaSource() {
+    var preferMMS = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true;
     try {
-      return isBrowser$1 ? window.MediaSource : null;
+      if (!isBrowser$1)
+        return null;
+      if (preferMMS && typeof ManagedMediaSource !== "undefined")
+        return ManagedMediaSource;
+      return window.MediaSource;
     } catch (e) {
     }
   }
-  var MediaSource = getMediaSource();
+  function isMMS(mediaSource) {
+    return /ManagedMediaSource/gi.test(Object.prototype.toString.call(mediaSource));
+  }
   var OP_NAME = {
     APPEND: "appendBuffer",
     REMOVE: "removeBuffer",
@@ -3115,6 +3122,12 @@
       _defineProperty$1(this, "_logger", null);
       _defineProperty$1(this, "_config", null);
       _defineProperty$1(this, "_url", null);
+      _defineProperty$1(this, "_onStartStreaming", function() {
+        _this2._logger.debug("startstreaming");
+      });
+      _defineProperty$1(this, "_onEndStreaming", function() {
+        _this2._logger.debug("endstreaming");
+      });
       _defineProperty$1(this, "_onSBUpdateEnd", function(type) {
         var queue = _this2._queue[type];
         if (queue) {
@@ -3174,6 +3187,11 @@
       get: function get() {
         return this.mediaSource ? this.mediaSource.readyState === "ended" : false;
       }
+    }, {
+      key: "streaming",
+      get: function get() {
+        return isMMS(this.mediaSource) ? this.mediaSource.streaming : true;
+      }
     }, {
       key: "isFull",
       value: function isFull(type) {
@@ -3198,12 +3216,12 @@
         }
         return this._enqueueBlockingOp(function() {
           if (_this3.isEnded) {
-            _this3._logger.debug("[debug mse] setDuration ended");
+            _this3._logger.debug("setDuration but ended");
             return;
           }
           if (_this3.mediaSource) {
             _this3.mediaSource.duration = duration;
-            _this3._logger.debug("[debug mse] setDuration");
+            _this3._logger.debug("setDuration", duration);
           }
         }, OP_NAME.UPDATE_DURATION, {
           isReduceDuration
@@ -3216,11 +3234,11 @@
         if (this._openPromise.used && !this.isOpened && this.mediaSource) {
           var ms = this.mediaSource;
           var onOpen = function onOpen2() {
-            var costtime = nowTime$1() - _this4._st;
-            _this4._logger.debug("MSE OPEN", costtime);
+            var costTime = nowTime$1() - _this4._st;
+            _this4._logger.debug("sourceopen", costTime);
             ms.removeEventListener("sourceopen", onOpen2);
             _this4._openPromise.resolve({
-              costtime
+              costtime: costTime
             });
           };
           ms.addEventListener("sourceopen", onOpen);
@@ -3233,7 +3251,7 @@
       value: function() {
         var _bindMedia = _asyncToGenerator(/* @__PURE__ */ _regeneratorRuntime().mark(function _callee(media) {
           var _this5 = this;
-          var ms, onOpen;
+          var MediaSource, ms, useMMS, onOpen;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1)
               switch (_context.prev = _context.next) {
@@ -3245,29 +3263,36 @@
                   _context.next = 3;
                   return this.unbindMedia();
                 case 3:
+                  MediaSource = getMediaSource(this._config.preferMMS);
                   if (!(!media || !MediaSource)) {
-                    _context.next = 5;
+                    _context.next = 6;
                     break;
                   }
                   throw new Error("Param media or MediaSource does not exist");
-                case 5:
+                case 6:
                   this.media = media;
                   ms = this.mediaSource = new MediaSource();
+                  useMMS = isMMS(ms);
                   this._st = nowTime$1();
                   onOpen = function onOpen2() {
-                    var costtime = nowTime$1() - _this5._st;
-                    _this5._logger.debug("MSE OPEN");
+                    var costTime = nowTime$1() - _this5._st;
+                    _this5._logger.debug("sourceopen");
                     ms.removeEventListener("sourceopen", onOpen2);
                     URL.revokeObjectURL(media.src);
                     _this5._openPromise.resolve({
-                      costtime
+                      costtime: costTime
                     });
                   };
                   ms.addEventListener("sourceopen", onOpen);
+                  if (useMMS) {
+                    ms.addEventListener("startstreaming", this._onStartStreaming);
+                    ms.addEventListener("endstreaming", this._onEndStreaming);
+                  }
                   this._url = URL.createObjectURL(ms);
                   media.src = this._url;
+                  media.disableRemotePlayback = useMMS;
                   return _context.abrupt("return", this._openPromise);
-                case 13:
+                case 17:
                 case "end":
                   return _context.stop();
               }
@@ -3315,8 +3340,13 @@
                       } catch (error) {
                       }
                     });
+                    if (isMMS(ms)) {
+                      ms.removeEventListener("startstreaming", this._onStartStreaming);
+                      ms.removeEventListener("endstreaming", this._onEndStreaming);
+                    }
                   }
                   if (this.media) {
+                    this.media.disableRemotePlayback = false;
                     this.media.removeAttribute("src");
                     try {
                       this.media.load();
@@ -3449,14 +3479,14 @@
         }
         if (!queue || !queue[type] || queue.length < 5)
           return;
-        var initOpque = [];
+        var initQueue = [];
         queue.forEach(function(op) {
           if (op.context && op.context.isinit) {
-            initOpque.push(op);
+            initQueue.push(op);
           }
         });
         this._queue[type] = queue.slice(0, 2);
-        initOpque.length > 0 && (_this$_queue$type = this._queue[type]).push.apply(_this$_queue$type, initOpque);
+        initQueue.length > 0 && (_this$_queue$type = this._queue[type]).push.apply(_this$_queue$type, initQueue);
       }
     }, {
       key: "endOfStream",
@@ -3651,16 +3681,10 @@
         }, "abort", context);
       }
     }], [{
-      key: "getDefaultConfig",
-      value: function getDefaultConfig() {
-        return {
-          openLog: false
-        };
-      }
-    }, {
       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 MediaSource = getMediaSource();
         if (!MediaSource)
           return false;
         try {
@@ -3670,6 +3694,14 @@
           return false;
         }
       }
+    }, {
+      key: "getDefaultConfig",
+      value: function getDefaultConfig() {
+        return {
+          openLog: false,
+          preferMMS: false
+        };
+      }
     }]);
     return MSE2;
   }();
@@ -9413,7 +9445,9 @@
         this._softVideo = softVideo;
       } else {
         this._remuxer = new FMP4Remuxer(this._demuxer.videoTrack, this._demuxer.audioTrack);
-        this._mse = new MSE();
+        this._mse = new MSE(null, {
+          preferMMS: typeof opts.preferMMS === "boolean" ? opts.preferMMS : !!opts.perferMMS
+        });
         this._mse.bindMedia(flv.media);
       }
     }
@@ -9423,6 +9457,12 @@
         var _this$_demuxer, _this$_demuxer$_fixer;
         return (_this$_demuxer = this._demuxer) === null || _this$_demuxer === void 0 ? void 0 : (_this$_demuxer$_fixer = _this$_demuxer._fixer) === null || _this$_demuxer$_fixer === void 0 ? void 0 : _this$_demuxer$_fixer._baseDts;
       }
+    }, {
+      key: "blobUrl",
+      get: function get() {
+        var _this$_mse;
+        return (_this$_mse = this._mse) === null || _this$_mse === void 0 ? void 0 : _this$_mse.url;
+      }
     }, {
       key: "isFull",
       value: function isFull() {
@@ -9888,7 +9928,8 @@
       seamlesslyReload: false,
       keepStatusAfterSwitch: true,
       onlyVideo: false,
-      onlyAudio: false
+      onlyAudio: false,
+      preferMMS: false
     }, opts);
     if (ret.isLive) {
       if (ret.preloadTime) {
@@ -10103,7 +10144,7 @@
             _this._gapService.do(media, opts.maxJumpDistance, _this.isLive, 3);
             return;
           }
-          if (opts.isLive && bufferEnd > opts.disconnectTime) {
+          if (opts.isLive && media.readyState === 4 && bufferEnd > opts.disconnectTime) {
             _this.disconnect();
           }
         }
@@ -10258,7 +10299,7 @@
     _createClass$4(Flv2, [{
       key: "version",
       get: function get() {
-        return "3.0.12";
+        return "3.0.15-alpha.2";
       }
     }, {
       key: "isLive",
@@ -10281,6 +10322,12 @@
       get: function get() {
         return this._mediaLoader;
       }
+    }, {
+      key: "blobUrl",
+      get: function get() {
+        var _this$_bufferService3;
+        return (_this$_bufferService3 = this._bufferService) === null || _this$_bufferService3 === void 0 ? void 0 : _this$_bufferService3.blobUrl;
+      }
     }, {
       key: "speedInfo",
       value: function speedInfo() {
@@ -10833,8 +10880,8 @@
           BasePlugin.defineGetterOrSetter(this.player, {
             url: {
               get: function get() {
-                var _this2$flv, _this2$flv$media;
-                return (_this2$flv = _this2.flv) === null || _this2$flv === void 0 ? void 0 : (_this2$flv$media = _this2$flv.media) === null || _this2$flv$media === void 0 ? void 0 : _this2$flv$media.src;
+                var _this2$flv;
+                return (_this2$flv = _this2.flv) === null || _this2$flv === void 0 ? void 0 : _this2$flv.blobUrl;
               },
               configurable: true
             }
@@ -10913,6 +10960,11 @@
       value: function isSupported(mediaType, codec) {
         return Flv.isSupported(mediaType, codec);
       }
+    }, {
+      key: "isSupportedMMS",
+      value: function isSupportedMMS() {
+        return typeof ManagedMediaSource !== "undefined";
+      }
     }]);
     return FlvPlugin2;
   }(BasePlugin);