Clean up repeat jitterbuffer target event

selkies-project · Jun 7, 2024 · ff0ba43 · ff0ba43
1 parent 7624076
commit ff0ba43
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/addons/gst-web/src/app.js b/addons/gst-web/src/app.js
@@ -518,44 +518,48 @@ function enableStatWatch() {
 }
 webrtc.onconnectionstatechange = (state) => {
     videoConnected = state;
-    if (videoConnected === "connected" && audioConnected === "connected") {
-        app.status = state;
-        if (!statwatchenabled) {
-            enableStatWatch();
-        }
+    if (videoConnected === "connected") {
         // Repeatedly emit minimum latency target
         webrtc.peerConnection.getReceivers().forEach((receiver) => {
-            let intervalLoop = setInterval(() => {
+            let intervalLoop = setInterval(async () => {
                 if (receiver.track.readyState !== "live" || receiver.transport.state !== "connected") {
                     clearInterval(intervalLoop);
                     return;
                 } else {
-                    receiver.jitterBufferTarget = receiver.jitterBufferDelayHint = receiver.playoutDelayHint = 0;
+                    receiver.jitterBufferTarget = receiver.jitterBufferDelayHint = receiver.playoutDelayHint = 0.0;
                 }
             }, 1);
         });
-    } else {
-        app.status = state === "connected" ? audioConnected : videoConnected;
     }
-};
-audio_webrtc.onconnectionstatechange = (state) => {
-    audioConnected = state;
     if (videoConnected === "connected" && audioConnected === "connected") {
         app.status = state;
         if (!statwatchenabled) {
             enableStatWatch();
         }
+    } else {
+        app.status = state === "connected" ? audioConnected : videoConnected;
+    }
+};
+audio_webrtc.onconnectionstatechange = (state) => {
+    audioConnected = state;
+    if (audioConnected === "connected") {
         // Repeatedly emit minimum latency target
         audio_webrtc.peerConnection.getReceivers().forEach((receiver) => {
-            let intervalLoop = setInterval(() => {
+            let intervalLoop = setInterval(async () => {
                 if (receiver.track.readyState !== "live" || receiver.transport.state !== "connected") {
                     clearInterval(intervalLoop);
                     return;
                 } else {
-                    receiver.jitterBufferTarget = receiver.jitterBufferDelayHint = receiver.playoutDelayHint = 0;
+                    receiver.jitterBufferTarget = receiver.jitterBufferDelayHint = receiver.playoutDelayHint = 0.0;
                 }
             }, 1);
         });
+    }
+    if (audioConnected === "connected" && videoConnected === "connected") {
+        app.status = state;
+        if (!statwatchenabled) {
+            enableStatWatch();
+        }
     } else {
         app.status = state === "connected" ? videoConnected : audioConnected;
     }