Merge remote-tracking branch 'upstream/develop' into develop

.vscode/settings.json

@@ -35,6 +35,7 @@
     "parse",
     "pranswer",
     "prflx",
+    "protoo",
     "psfb",
     "raddr",
     "reconfig",
@@ -69,8 +70,10 @@
     "xffffffffn"
   ],
   "liveServer.settings.port": 5501,
-  "liveServer.settings.ignoreFiles": ["**"],
+  "liveServer.settings.ignoreFiles": [
+    "**"
+  ],
   "typescript.tsdk": "node_modules/typescript/lib",
   "python.formatting.provider": "black",
   "commentTranslate.source": "intellsmi.deepl-translate-deepl"
-}
+}

e2e/karma.conf.js

@@ -44,7 +44,7 @@ module.exports = function (config) {
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
     customLaunchers: {
       chrome_headless_with_fake_device: {
-        base: "ChromeCanaryHeadless",
+        base: "ChromeHeadless",
         flags: [
           "--use-fake-device-for-media-stream",
           "--use-fake-ui-for-media-stream",
@@ -53,7 +53,7 @@ module.exports = function (config) {
         ],
       },
       chrome_with_fake_device: {
-        base: "ChromeCanary",
+        base: "Chrome",
         flags: [
           "--use-fake-device-for-media-stream",
           "--use-fake-ui-for-media-stream",

e2e/server/handler/mediachannel/addTrack.ts

@@ -6,32 +6,28 @@ import {
   MediaStreamTrack,
   RtpPacket,
   randomPort,
+  MediaStreamTrackFactory,
 } from "../../";
 import { peerConfig } from "../../fixture";
 
 export class mediachannel_addTrack_answer {
   pc!: RTCPeerConnection;
   process!: ChildProcess;
-  udp = createSocket("udp4");
+  private disposer = () => {};
 
   async exec(type: string, payload: any, accept: AcceptFn) {
     switch (type) {
       case "init":
         {
-          const port = await randomPort();
-          this.udp.bind(port);
+          const [track, port, disposer] =
+            await MediaStreamTrackFactory.rtpSource({ kind: "video" });
+          this.disposer = disposer;
 
           this.pc = new RTCPeerConnection(await peerConfig);
-          const track = new MediaStreamTrack({ kind: "video" });
           this.pc.addTrack(track);
           await this.pc.setLocalDescription(await this.pc.createOffer());
           accept(this.pc.localDescription);
 
-          this.udp.on("message", (data) => {
-            const rtp = RtpPacket.deSerialize(data);
-            track.writeRtp(rtp);
-          });
-
           const args = [
             `videotestsrc`,
             "video/x-raw,width=640,height=480,format=I420",
@@ -56,7 +52,7 @@ export class mediachannel_addTrack_answer {
         break;
       case "done":
         {
-          this.udp.close();
+          this.disposer();
           this.pc.close();
           try {
             this.process.kill("SIGINT");

examples/mediachannel/sendonly/offer.ts

@@ -38,7 +38,6 @@ server.on("connection", async (socket) => {
       "rtpvp8pay",
       `udpsink host=127.0.0.1 port=${port}`,
     ].join(" ! ");
-
     spawn("gst-launch-1.0", args.split(" "));
     udp.on("message", (data) => {
       const rtp = RtpPacket.deSerialize(data);