fix: combine tracks

varshith15 · Dec 23, 2024 · 7035b03 · 7035b03
1 parent 6dad03a
commit 7035b03
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/server/app.py b/server/app.py
@@ -59,7 +59,7 @@ def __init__(self, track: MediaStreamTrack):
 
     async def recv(self):
         frame = await self.track.recv()
-        return await self.pipeline(frame)
+        return frame
 
     # async def recv(self):
     #     frame = await self.source.recv()

diff --git a/ui/src/components/webcam.tsx b/ui/src/components/webcam.tsx
@@ -18,14 +18,21 @@ function StreamCanvas({
   const videoRef = useRef<HTMLVideoElement | null>(null);
 
   useEffect(() => {
+    if (!stream) return;
+
     const canvas = canvasRef.current!;
-    const outputStream = canvas.captureStream(30);
-    onStreamReady(outputStream);
+    const videoOnlyStream = canvas.captureStream(frameRate);
+    const audioTracks = stream.getAudioTracks();
+    const combinedStream = new MediaStream([
+      ...videoOnlyStream.getVideoTracks(),
+      ...audioTracks,
+    ]);
+    onStreamReady(combinedStream);
 
     return () => {
-      outputStream.getTracks().forEach((track) => track.stop());
+      combinedStream.getTracks().forEach((track) => track.stop());
     };
-  }, [onStreamReady, frameRate]);
+  }, [stream, frameRate, onStreamReady]);
 
   // Set up canvas animation loop
   useEffect(() => {