Don't store streams that are only used once (#2157)

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
matrix-org · Feb 8, 2022 · 5d4e318 · 5d4e318
1 parent 07171a9
commit 5d4e318
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/webrtc/call.ts b/src/webrtc/call.ts
@@ -937,7 +937,7 @@ export class MatrixCall extends EventEmitter {
             const upgradeVideo = video && !this.hasLocalUserMediaVideoTrack;
             logger.debug(`Upgrading call: audio?=${upgradeAudio} video?=${upgradeVideo}`);
 
-            const stream = await this.client.getMediaHandler().getUserMediaStream(upgradeAudio, upgradeVideo);
+            const stream = await this.client.getMediaHandler().getUserMediaStream(upgradeAudio, upgradeVideo, false);
             if (upgradeAudio && upgradeVideo) {
                 if (this.hasLocalUserMediaAudioTrack) return;
                 if (this.hasLocalUserMediaVideoTrack) return;
@@ -1978,14 +1978,15 @@ export class MatrixCall extends EventEmitter {
     }
 
     private stopAllMedia(): void {
-        logger.debug(`stopAllMedia (stream=${this.localUsermediaStream})`);
+        logger.debug("Stopping all media for call", this.callId);
 
         for (const feed of this.feeds) {
             if (feed.isLocal() && feed.purpose === SDPStreamMetadataPurpose.Usermedia) {
                 this.client.getMediaHandler().stopUserMediaStream(feed.stream);
             } else if (feed.isLocal() && feed.purpose === SDPStreamMetadataPurpose.Screenshare) {
                 this.client.getMediaHandler().stopScreensharingStream(feed.stream);
             } else {
+                logger.debug("Stopping remote stream", feed.stream.id);
                 for (const track of feed.stream.getTracks()) {
                     track.stop();
                 }

diff --git a/src/webrtc/mediaHandler.ts b/src/webrtc/mediaHandler.ts
@@ -54,9 +54,12 @@ export class MediaHandler {
     }
 
     /**
+     * @param audio should have an audio track
+     * @param video should have a video track
+     * @param reusable is allowed to be reused by the MediaHandler
      * @returns {MediaStream} based on passed parameters
      */
-    public async getUserMediaStream(audio: boolean, video: boolean): Promise<MediaStream> {
+    public async getUserMediaStream(audio: boolean, video: boolean, reusable = true): Promise<MediaStream> {
         const shouldRequestAudio = audio && await this.hasAudioDevice();
         const shouldRequestVideo = video && await this.hasVideoDevice();
 
@@ -78,7 +81,9 @@ export class MediaHandler {
             stream = await navigator.mediaDevices.getUserMedia(constraints);
         }
 
-        this.userMediaStreams.push(stream);
+        if (reusable) {
+            this.userMediaStreams.push(stream);
+        }
 
         return stream;
     }
@@ -101,9 +106,11 @@ export class MediaHandler {
     }
 
     /**
+     * @param desktopCapturerSourceId sourceId for Electron DesktopCapturer
+     * @param reusable is allowed to be reused by the MediaHandler
      * @returns {MediaStream} based on passed parameters
      */
-    public async getScreensharingStream(desktopCapturerSourceId: string): Promise<MediaStream | null> {
+    public async getScreensharingStream(desktopCapturerSourceId: string, reusable = true): Promise<MediaStream | null> {
         let stream: MediaStream;
 
         if (this.screensharingStreams.length === 0) {
@@ -125,7 +132,9 @@ export class MediaHandler {
             stream = matchingStream.clone();
         }
 
-        this.screensharingStreams.push(stream);
+        if (reusable) {
+            this.screensharingStreams.push(stream);
+        }
 
         return stream;
     }