Merge commit 'd635c3a7af366849e7663b2105e7a7831579d3a8' into develop

examples/google-nest/server.ts

@@ -66,10 +66,10 @@ const session = async (
         ],
       },
     });
-    const recorder = new MediaRecorder(
-      `./${device.name.split("/").at(-1)}.webm`,
-      2,
-    );
+    const recorder = new MediaRecorder({
+      path: `./${device.name.split("/").at(-1)}.webm`,
+      numOfTracks: 2,
+    });
 
     const audioTransceiver = pc.addTransceiver("audio", {
       direction: "recvonly",

examples/mediachannel/red/record/server.ts

@@ -29,7 +29,11 @@ server.on("connection", async (socket) => {
   const audio = pc.addTransceiver("audio");
   audio.onTrack.subscribe((track) => {
     audio.sender.replaceTrack(track);
-    const recorder = new MediaRecorder("./audio.webm", 1, { tracks: [track] });
+    const recorder = new MediaRecorder({
+      path: "./audio.webm",
+      numOfTracks: 1,
+      tracks: [track],
+    });
     setTimeout(() => {
       recorder.stop();
       console.log("stop");

examples/save_to_disk/av1x.ts

@@ -11,7 +11,9 @@ const server = new Server({ port: 8878 });
 console.log("start");
 
 server.on("connection", async (socket) => {
-  const recorder = new MediaRecorder("./test.webm", 2, {
+  const recorder = new MediaRecorder({
+    path: "./test.webm",
+    numOfTracks: 2,
     width: 640,
     height: 360,
   });

examples/save_to_disk/dump.ts

@@ -12,7 +12,9 @@ import { MediaRecorder } from "../../packages/webrtc/src/nonstandard";
   );
 
   const track = new MediaStreamTrack({ kind: "video" });
-  const recorder = new MediaRecorder("./test.webm", 1, {
+  const recorder = new MediaRecorder({
+    path: "./test.webm",
+    numOfTracks: 1,
     width: 640,
     height: 360,
     tracks: [track],

examples/save_to_disk/opus.ts

@@ -0,0 +1,42 @@
+import { Server } from "ws";
+import { RTCPeerConnection } from "../../packages/webrtc/src";
+import { MediaRecorder } from "../../packages/webrtc/src/nonstandard";
+
+// open ./answer.html
+
+const server = new Server({ port: 8878 });
+console.log("start");
+
+server.on("connection", async (socket) => {
+  const recorder = new MediaRecorder({
+    path: `./opus-${Date.now()}.webm`,
+    numOfTracks: 1,
+  });
+
+  const pc = new RTCPeerConnection();
+
+  pc.addTransceiver("video").onTrack.subscribe(async (track, transceiver) => {
+    transceiver.sender.replaceTrack(track);
+    setInterval(() => {
+      transceiver.receiver.sendRtcpPLI(track.ssrc);
+    }, 3_000);
+  });
+
+  pc.addTransceiver("audio").onTrack.subscribe(async (track, transceiver) => {
+    transceiver.sender.replaceTrack(track);
+    await recorder.addTrack(track);
+  });
+
+  setTimeout(async () => {
+    await recorder.stop();
+    console.log("stop");
+  }, 15_000);
+
+  await pc.setLocalDescription(await pc.createOffer());
+  const sdp = JSON.stringify(pc.localDescription);
+  socket.send(sdp);
+
+  socket.on("message", (data: any) => {
+    pc.setRemoteDescription(JSON.parse(data));
+  });
+});

examples/save_to_disk/packetloss/vp8.ts

@@ -13,7 +13,9 @@ const server = new Server({ port: 8888 });
 console.log("start");
 
 server.on("connection", async (socket) => {
-  const recorder = new MediaRecorder("./werift.webm", 1, {
+  const recorder = new MediaRecorder({
+    path: "./werift.webm",
+    numOfTracks: 1,
     width: 640,
     height: 360,
     jitterBufferLatency: 50,

examples/save_to_disk/vp8.ts

@@ -8,7 +8,9 @@ const server = new Server({ port: 8878 });
 console.log("start");
 
 server.on("connection", async (socket) => {
-  const recorder = new MediaRecorder(`./vp8-${Date.now()}.webm`, 2, {
+  const recorder = new MediaRecorder({
+    path: `./vp8-${Date.now()}.webm`,
+    numOfTracks: 2,
     width: 640,
     height: 360,
   });

examples/save_to_disk/vp9.ts

@@ -11,7 +11,9 @@ const server = new Server({ port: 8878 });
 console.log("start");
 
 server.on("connection", async (socket) => {
-  const recorder = new MediaRecorder("./test.webm", 2, {
+  const recorder = new MediaRecorder({
+    path: "./test.webm",
+    numOfTracks: 2,
     width: 640,
     height: 360,
   });

packages/webrtc/src/nonstandard/recorder/index.ts

@@ -1,37 +1,61 @@
 import Event from "rx.mini";
 
+import type { PassThrough } from "stream";
 import type { MediaStreamTrack } from "../../media/track";
 import type { MediaWriter } from "./writer";
 import { WebmFactory } from "./writer/webm";
 
 export class MediaRecorder {
   writer: MediaWriter;
-  ext: string;
+  ext?: string;
   tracks: MediaStreamTrack[] = [];
   started = false;
   onError = new Event<[Error]>();
 
   constructor(
-    public path: string,
-    public numOfTracks = 1,
-    public options: Partial<MediaRecorderOptions> = {},
+    public props: Partial<MediaRecorderOptions> & {
+      numOfTracks: number;
+    } & (
+        | {
+            path: string;
+            stream?: PassThrough;
+          }
+        | {
+            path?: string;
+            stream: PassThrough;
+          }
+      ),
   ) {
-    this.ext = path.split(".").slice(-1)[0];
-    this.writer = (() => {
-      switch (this.ext) {
-        case "webm":
-          return new WebmFactory(path, options);
-        default:
-          throw new Error();
-      }
-    })();
-
-    this.tracks = options.tracks ?? this.tracks;
-    if (this.tracks.length === numOfTracks) {
+    this.tracks = props.tracks ?? this.tracks;
+    if (this.tracks.length === props.numOfTracks) {
       this.start().catch((error) => {
         this.onError.execute(error);
       });
     }
+
+    const { path, stream } = props;
+
+    if (path) {
+      this.ext = path.split(".").slice(-1)[0];
+      this.writer = (() => {
+        switch (this.ext) {
+          case "webm":
+            return new WebmFactory({
+              ...props,
+              path: path!,
+              stream: stream!,
+            });
+          default:
+            throw new Error();
+        }
+      })();
+    } else {
+      this.writer = new WebmFactory({
+        ...props,
+        path: path!,
+        stream: stream!,
+      });
+    }
   }
 
   async addTrack(track: MediaStreamTrack) {
@@ -40,7 +64,10 @@ export class MediaRecorder {
   }
 
   private async start() {
-    if (this.tracks.length === this.numOfTracks && this.started === false) {
+    if (
+      this.tracks.length === this.props.numOfTracks &&
+      this.started === false
+    ) {
       this.started = true;
       await this.writer.start(this.tracks);
     }
@@ -59,4 +86,5 @@ export interface MediaRecorderOptions {
   waitForKeyframe: boolean;
   defaultDuration: number;
   tracks: MediaStreamTrack[];
+  disableNtp: boolean;
 }

packages/webrtc/src/nonstandard/recorder/writer/index.ts

@@ -1,10 +1,13 @@
+import type { PassThrough } from "stream";
 import type { MediaRecorderOptions } from "..";
 import type { MediaStreamTrack } from "../../..";
 
 export abstract class MediaWriter {
   constructor(
-    protected path: string,
-    protected options: Partial<MediaRecorderOptions>,
+    protected props: Partial<MediaRecorderOptions> & {
+      path: string;
+      stream?: PassThrough;
+    } & { path?: string; stream: PassThrough },
   ) {}
 
   async start(tracks: MediaStreamTrack[]) {}

packages/webrtc/src/nonstandard/recorder/writer/webm.ts

@@ -10,6 +10,7 @@ import {
   NtpTimeCallback,
   RtcpSourceCallback,
   RtpSourceCallback,
+  RtpTimeCallback,
   type SupportedCodec,
   WebmCallback,
   saveToFileSystem,
@@ -23,7 +24,9 @@ export class WebmFactory extends MediaWriter {
   unSubscribers = new EventDisposer();
 
   async start(tracks: MediaStreamTrack[]) {
-    await unlink(this.path).catch((e) => e);
+    if (this.props.path) {
+      await unlink(this.props.path).catch((e) => e);
+    }
 
     const inputTracks = tracks.map((track, i) => {
       const trackNumber = i + 1;
@@ -52,8 +55,8 @@ export class WebmFactory extends MediaWriter {
           codec,
           clockRate: 90000,
           trackNumber,
-          width: this.options.width,
-          height: this.options.height,
+          width: this.props.width ?? 640,
+          height: this.props.height ?? 360,
           payloadType,
           track,
         };
@@ -70,7 +73,7 @@ export class WebmFactory extends MediaWriter {
     });
 
     const webm = new WebmCallback(inputTracks, {
-      duration: this.options.defaultDuration ?? 1000 * 60 * 60 * 24,
+      duration: this.props.defaultDuration ?? 1000 * 60 * 60 * 24,
     });
     const lipsync = new LipsyncCallback();
 
@@ -87,7 +90,9 @@ export class WebmFactory extends MediaWriter {
           rtcpSource.input(rtcp);
         })
         .disposer(this.unSubscribers);
-      const ntpTime = new NtpTimeCallback(clockRate);
+      const time = this.props.disableNtp
+        ? new RtpTimeCallback(clockRate)
+        : new NtpTimeCallback(clockRate);
 
       if (track.kind === "video") {
         const depacketizer = new DepacketizeCallback(codec, {
@@ -96,26 +101,32 @@ export class WebmFactory extends MediaWriter {
         const jitterBuffer = new JitterBufferCallback(clockRate);
 
         rtpSource.pipe(jitterBuffer.input);
-        rtcpSource.pipe(ntpTime.input);
+        rtcpSource.pipe(time.input);
 
-        jitterBuffer.pipe(ntpTime.input);
-        ntpTime.pipe(depacketizer.input);
+        jitterBuffer.pipe(time.input);
+        time.pipe(depacketizer.input);
         depacketizer.pipe(lipsync.inputVideo);
         lipsync.pipeVideo(webm.inputVideo);
       } else {
         const depacketizer = new DepacketizeCallback(codec);
 
-        rtpSource.pipe(ntpTime.input);
-        rtcpSource.pipe(ntpTime.input);
+        rtpSource.pipe(time.input);
+        rtcpSource.pipe(time.input);
 
-        ntpTime.pipe(depacketizer.input);
+        time.pipe(depacketizer.input);
         depacketizer.pipe(lipsync.inputAudio);
         lipsync.pipeAudio(webm.inputAudio);
       }
 
       return rtpSource;
     });
-    webm.pipe(saveToFileSystem(this.path));
+    if (this.props.path) {
+      webm.pipe(saveToFileSystem(this.props.path));
+    } else if (this.props.stream) {
+      webm.pipe(async (o) => {
+        this.props.stream.write(o);
+      });
+    }
   }
 
   async stop() {