@besovideo/webrtc-player 0.8.41 → 0.8.43

package/dist/main.browser.js

@@ -77,7 +77,7 @@ var bvPlayerCore = (() => {
   };
 
   // <define:process.env>
-  var define_process_env_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.40", PROJECT_NAMESPACE: "bvplayer" };
+  var define_process_env_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.43", PROJECT_NAMESPACE: "bvplayer" };
 
   // node_modules/@shirtiny/logger/dist/main.es.js
   var _ = Object.defineProperty;
@@ -4725,9 +4725,10 @@ var bvPlayerCore = (() => {
     yield screenshotByCanvas(canvas, fileName);
   });
   var record = (element, stream, fileName = `record_${Date.now()}`) => {
-    const options = { mimeType: "video/webm; codecs=vp9" };
     try {
       const mediaStream = stream || element.captureStream(25);
+      const hasVideo = mediaStream.getVideoTracks().length > 0;
+      const options = hasVideo ? { mimeType: "video/webm; codecs=vp9,opus" } : { mimeType: "audio/webm; codecs=opus" };
       logger_default.info("\u6355\u83B7\u7684\u6D41\u548C\u5F55\u5236\u914D\u7F6E\u9879\uFF1A", mediaStream, options);
       let recordedChunks = [];
       const mediaRecorder = new MediaRecorder(mediaStream, options);
@@ -4979,6 +4980,9 @@ var bvPlayerCore = (() => {
       this._canvasEl = newEl;
       this._mediaStream = null;
     }
+    setCaptureProvider(capture) {
+      this._captureStream = capture;
+    }
     play() {
       return __async(this, null, function* () {
         const el = this._videoEl;
@@ -5016,7 +5020,12 @@ var bvPlayerCore = (() => {
       if (this._recorder) {
         this.recordStop();
       }
-      const streamEl = this.canvasEnabled ? this._canvasEl : this._videoEl;
+      const captureStream = () => {
+        if (this._captureStream) {
+          return this._captureStream();
+        }
+      };
+      const streamEl = this.canvasEnabled ? { captureStream } : this._videoEl;
       if (!streamEl)
         return;
       const fileName = this._genFileName("record");
@@ -9720,7 +9729,7 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
       return __async(this, null, function* () {
         if (!this._isInClose) {
           this._isInClose = true;
-          yield this.dispatchSync("close");
+          this.dispatch("close");
           this.closeWebrtc();
         }
       });
@@ -9986,8 +9995,9 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
         }
       });
     }
-    enableCanvas(enable) {
+    enableCanvas(enable, captureStream) {
       this._video.canvasEnabled = !!enable;
+      this._video.setCaptureProvider(captureStream);
     }
     replaceCanvas(canvas) {
       this._video.setCanvasEl(canvas);
@@ -10222,6 +10232,38 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
         this.init_callback();
       }
     }
+    captureStream() {
+      const audioTracks = [];
+      const videoTracks = [];
+      if (this.audioPlayer) {
+        const audioStream = this.audioPlayer.getAudioStream();
+        audioStream == null ? void 0 : audioStream.getAudioTracks().forEach((track) => {
+          audioTracks.push(track);
+        });
+      }
+      let hasVideo = (this.mediaDir & 2) == 2;
+      if (hasVideo) {
+        if (this.videoInfo.webcodecs) {
+          if (this.videoPlayer && this.videoPlayer.mContainer.srcObject) {
+            const mediaStram = this.videoPlayer.mContainer.srcObject;
+            if (mediaStram) {
+              mediaStram == null ? void 0 : mediaStram.getAudioTracks().forEach((track) => {
+                audioTracks.push(track);
+              });
+              mediaStram == null ? void 0 : mediaStram.getVideoTracks().forEach((track) => {
+                videoTracks.push(track);
+              });
+            }
+          }
+        } else if (this.canvas) {
+          const canvasStream = this.canvas.captureStream(24);
+          canvasStream == null ? void 0 : canvasStream.getVideoTracks().forEach((track) => {
+            videoTracks.push(track);
+          });
+        }
+      }
+      return new MediaStream([...audioTracks, ...videoTracks]);
+    }
     _OnOpen({ hplayer }) {
       this.hplayer = hplayer;
       console.log("open player ok! " + hplayer);
@@ -10360,6 +10402,7 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
     this.interval = setInterval(this.flush, this.option.flushingTime);
     this.maxValue = this.getMaxValue();
     this.typedArray = this.getTypedArray();
+    this.audioStream = null;
     this.createContext();
   };
   BVPCMPlayer.prototype.getMaxValue = function() {
@@ -10380,12 +10423,19 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
     };
     return typedArrays[this.option.encoding] ? typedArrays[this.option.encoding] : typedArrays["s16"];
   };
+  BVPCMPlayer.prototype.getAudioStream = function() {
+    return this.audioStream;
+  };
   BVPCMPlayer.prototype.createContext = function() {
     this.audioCtx = new (window.AudioContext || window.webkitAudioContext)();
     this.audioCtx.resume();
     this.gainNode = this.audioCtx.createGain();
     this.gainNode.gain.value = 1;
-    this.gainNode.connect(this.audioCtx.destination);
+    const dest = this.audioCtx.createMediaStreamDestination();
+    this.gainNode.connect(dest);
+    const videoEle = document.createElement("video");
+    videoEle.srcObject = this.audioStream = dest.stream;
+    videoEle.play();
     this.startTime = this.audioCtx.currentTime;
   };
   BVPCMPlayer.prototype.isTypedArray = function(data) {
@@ -10414,6 +10464,10 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
     if (this.interval) {
       clearInterval(this.interval);
     }
+    if (this.audioStream) {
+      this.audioStream.getAudioTracks().forEach((item) => item.stop());
+      this.audioStream = null;
+    }
     this.samples = null;
     this.audioCtx.close();
     this.audioCtx = null;
@@ -11995,7 +12049,7 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
         case "f32-planar":
           tempArray = new Float32Array(dataArray.buffer);
           byteCount = 4;
-          iConstMaxData = 2147483647;
+          iConstMaxData = 1;
           break;
       }
       const iPastMs = 1e3 / sampleRate * dataArray.length / byteCount;
@@ -12353,7 +12407,8 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
               logger_default.debug("error\u7684\u7C7B\u578B", e.name, e instanceof OpenDialogError);
               if (e instanceof OpenDialogError || protocol === "webrtc")
                 throw e;
-              player.enableCanvas(true);
+              const captureStream = () => hplayer == null ? void 0 : hplayer.captureStream();
+              player.enableCanvas(true, captureStream);
               this.protocol = "ws-bvrtc";
               hplayer = new BVMedia();
               if (noVideoRendeAudioWaveform && !defaultMediaOption.video) {
@@ -12450,7 +12505,7 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
                 const audioList = [
                   {
                     label: t("codec"),
-                    value: hplayer.getAudioInfo().codec
+                    value: hplayer.getAudioInfo().codec + (hplayer.getAudioInfo().webcodecs ? "(webcodecs)" : "")
                   },
                   {
                     label: t("sample-accuracy"),

package/dist/main.es.js

@@ -71,7 +71,7 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // <define:process.env>
-var define_process_env_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.40", PROJECT_NAMESPACE: "bvplayer" };
+var define_process_env_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.43", PROJECT_NAMESPACE: "bvplayer" };
 
 // node_modules/@shirtiny/logger/dist/main.es.js
 var _ = Object.defineProperty;
@@ -4709,9 +4709,10 @@ var screenshot = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (videoEl,
   yield screenshotByCanvas(canvas, fileName);
 });
 var record = (element, stream, fileName = `record_${Date.now()}`) => {
-  const options = { mimeType: "video/webm; codecs=vp9" };
   try {
     const mediaStream = stream || element.captureStream(25);
+    const hasVideo = mediaStream.getVideoTracks().length > 0;
+    const options = hasVideo ? { mimeType: "video/webm; codecs=vp9,opus" } : { mimeType: "audio/webm; codecs=opus" };
     logger_default.info("\u6355\u83B7\u7684\u6D41\u548C\u5F55\u5236\u914D\u7F6E\u9879\uFF1A", mediaStream, options);
     let recordedChunks = [];
     const mediaRecorder = new MediaRecorder(mediaStream, options);
@@ -4963,6 +4964,9 @@ var VideoPlugin = class extends Plugin {
     this._canvasEl = newEl;
     this._mediaStream = null;
   }
+  setCaptureProvider(capture) {
+    this._captureStream = capture;
+  }
   play() {
     return __async(this, null, function* () {
       const el = this._videoEl;
@@ -5000,7 +5004,12 @@ var VideoPlugin = class extends Plugin {
     if (this._recorder) {
       this.recordStop();
     }
-    const streamEl = this.canvasEnabled ? this._canvasEl : this._videoEl;
+    const captureStream = () => {
+      if (this._captureStream) {
+        return this._captureStream();
+      }
+    };
+    const streamEl = this.canvasEnabled ? { captureStream } : this._videoEl;
     if (!streamEl)
       return;
     const fileName = this._genFileName("record");
@@ -9704,7 +9713,7 @@ var PlayerPlugin = class extends Plugin {
     return __async(this, null, function* () {
       if (!this._isInClose) {
         this._isInClose = true;
-        yield this.dispatchSync("close");
+        this.dispatch("close");
         this.closeWebrtc();
       }
     });
@@ -9970,8 +9979,9 @@ var PlayerPlugin = class extends Plugin {
       }
     });
   }
-  enableCanvas(enable) {
+  enableCanvas(enable, captureStream) {
     this._video.canvasEnabled = !!enable;
+    this._video.setCaptureProvider(captureStream);
   }
   replaceCanvas(canvas) {
     this._video.setCanvasEl(canvas);
@@ -10206,6 +10216,38 @@ var BVMedia = class {
       this.init_callback();
     }
   }
+  captureStream() {
+    const audioTracks = [];
+    const videoTracks = [];
+    if (this.audioPlayer) {
+      const audioStream = this.audioPlayer.getAudioStream();
+      audioStream == null ? void 0 : audioStream.getAudioTracks().forEach((track) => {
+        audioTracks.push(track);
+      });
+    }
+    let hasVideo = (this.mediaDir & 2) == 2;
+    if (hasVideo) {
+      if (this.videoInfo.webcodecs) {
+        if (this.videoPlayer && this.videoPlayer.mContainer.srcObject) {
+          const mediaStram = this.videoPlayer.mContainer.srcObject;
+          if (mediaStram) {
+            mediaStram == null ? void 0 : mediaStram.getAudioTracks().forEach((track) => {
+              audioTracks.push(track);
+            });
+            mediaStram == null ? void 0 : mediaStram.getVideoTracks().forEach((track) => {
+              videoTracks.push(track);
+            });
+          }
+        }
+      } else if (this.canvas) {
+        const canvasStream = this.canvas.captureStream(24);
+        canvasStream == null ? void 0 : canvasStream.getVideoTracks().forEach((track) => {
+          videoTracks.push(track);
+        });
+      }
+    }
+    return new MediaStream([...audioTracks, ...videoTracks]);
+  }
   _OnOpen({ hplayer }) {
     this.hplayer = hplayer;
     console.log("open player ok! " + hplayer);
@@ -10344,6 +10386,7 @@ BVPCMPlayer.prototype.init = function(option) {
   this.interval = setInterval(this.flush, this.option.flushingTime);
   this.maxValue = this.getMaxValue();
   this.typedArray = this.getTypedArray();
+  this.audioStream = null;
   this.createContext();
 };
 BVPCMPlayer.prototype.getMaxValue = function() {
@@ -10364,12 +10407,19 @@ BVPCMPlayer.prototype.getTypedArray = function() {
   };
   return typedArrays[this.option.encoding] ? typedArrays[this.option.encoding] : typedArrays["s16"];
 };
+BVPCMPlayer.prototype.getAudioStream = function() {
+  return this.audioStream;
+};
 BVPCMPlayer.prototype.createContext = function() {
   this.audioCtx = new (window.AudioContext || window.webkitAudioContext)();
   this.audioCtx.resume();
   this.gainNode = this.audioCtx.createGain();
   this.gainNode.gain.value = 1;
-  this.gainNode.connect(this.audioCtx.destination);
+  const dest = this.audioCtx.createMediaStreamDestination();
+  this.gainNode.connect(dest);
+  const videoEle = document.createElement("video");
+  videoEle.srcObject = this.audioStream = dest.stream;
+  videoEle.play();
   this.startTime = this.audioCtx.currentTime;
 };
 BVPCMPlayer.prototype.isTypedArray = function(data) {
@@ -10398,6 +10448,10 @@ BVPCMPlayer.prototype.destroy = function() {
   if (this.interval) {
     clearInterval(this.interval);
   }
+  if (this.audioStream) {
+    this.audioStream.getAudioTracks().forEach((item) => item.stop());
+    this.audioStream = null;
+  }
   this.samples = null;
   this.audioCtx.close();
   this.audioCtx = null;
@@ -11979,7 +12033,7 @@ var MediaStreamAudioWaveShowBVRtc = class {
       case "f32-planar":
         tempArray = new Float32Array(dataArray.buffer);
         byteCount = 4;
-        iConstMaxData = 2147483647;
+        iConstMaxData = 1;
         break;
     }
     const iPastMs = 1e3 / sampleRate * dataArray.length / byteCount;
@@ -12337,7 +12391,8 @@ var PuPlayer = (props) => {
             logger_default.debug("error\u7684\u7C7B\u578B", e.name, e instanceof OpenDialogError);
             if (e instanceof OpenDialogError || protocol === "webrtc")
               throw e;
-            player.enableCanvas(true);
+            const captureStream = () => hplayer == null ? void 0 : hplayer.captureStream();
+            player.enableCanvas(true, captureStream);
             this.protocol = "ws-bvrtc";
             hplayer = new BVMedia();
             if (noVideoRendeAudioWaveform && !defaultMediaOption.video) {
@@ -12434,7 +12489,7 @@ var PuPlayer = (props) => {
               const audioList = [
                 {
                   label: t("codec"),
-                  value: hplayer.getAudioInfo().codec
+                  value: hplayer.getAudioInfo().codec + (hplayer.getAudioInfo().webcodecs ? "(webcodecs)" : "")
                 },
                 {
                   label: t("sample-accuracy"),

package/dist/types/plugins/player/index.d.ts

@@ -92,7 +92,7 @@ declare class PlayerPlugin extends Plugin<HTMLDivElement, IPlayerPluginEventMap>
     private closeWebrtc;
     private refreshInfoModal;
     togglePtz(): Promise<void>;
-    enableCanvas(enable: boolean): void;
+    enableCanvas(enable: boolean, captureStream?: () => MediaStream): void;
     replaceCanvas(canvas: HTMLCanvasElement): void;
     setVideoFit(fit: keyof IVideoFits): void;
     fullscreen(): void;

package/dist/types/plugins/video.d.ts

@@ -42,6 +42,8 @@ declare class VideoPlugin extends Plugin<HTMLDivElement, IVideoPluginEventMap> {
     getVideoEl(): HTMLVideoElement;
     getCanvasEl(): HTMLCanvasElement;
     setCanvasEl(newEl: HTMLCanvasElement): void;
+    private _captureStream;
+    setCaptureProvider(capture?: () => MediaStream): void;
     play(): Promise<void>;
     pause(): void;
     screenshot(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@besovideo/webrtc-player",
-  "version": "0.8.41",
+  "version": "0.8.43",
   "description": "@besovideo/webrtc-player desc",
   "type": "module",
   "types": "./dist/types/main.d.ts",
@@ -70,4 +70,4 @@
     "> 1%",
     "not dead"
   ]
-}
+}