Avoid CropAndScale calls in RingRTC

Author: indutny-signal

ACKNOWLEDGMENTS.md

@@ -12842,7 +12842,7 @@ For more information on this, and how to apply and follow the GNU AGPL, see
 
 ```
 
-## libsignal-account-keys 0.1.0, libsignal-core 0.1.0, mrp 2.50.3, protobuf 2.50.3, ringrtc 2.50.3, regex-aot 0.1.0, partial-default-derive 0.1.0
+## libsignal-account-keys 0.1.0, libsignal-core 0.1.0, mrp 2.50.4, protobuf 2.50.4, ringrtc 2.50.4, regex-aot 0.1.0, partial-default-derive 0.1.0
 
 ```
 GNU AFFERO GENERAL PUBLIC LICENSE
@@ -13626,7 +13626,7 @@ THIS SOFTWARE.
 
 ```
 
-## cubeb-core 0.22.0, cubeb-sys 0.22.0, cubeb 0.22.0
+## cubeb-core 0.27.0, cubeb-sys 0.27.0, cubeb 0.27.0
 
 ```
 Copyright © 2017 Mozilla Foundation

package.json

@@ -120,7 +120,7 @@
     "@react-spring/web": "9.7.5",
     "@signalapp/libsignal-client": "0.68.0",
     "@signalapp/quill-cjs": "2.1.2",
-    "@signalapp/ringrtc": "2.50.3",
+    "@signalapp/ringrtc": "2.50.4",
     "@signalapp/sqlcipher": "1.0.0",
     "@tanstack/react-virtual": "3.11.2",
     "@types/fabric": "4.5.3",

pnpm-lock.yaml

@@ -8,6 +8,9 @@ export const REQUESTED_VIDEO_WIDTH = 960;
 export const REQUESTED_VIDEO_HEIGHT = 720;
 export const REQUESTED_VIDEO_FRAMERATE = 30;
 
+export const REQUESTED_GROUP_VIDEO_WIDTH = 640;
+export const REQUESTED_GROUP_VIDEO_HEIGHT = 480;
+
 export const REQUESTED_SCREEN_SHARE_WIDTH = 2880;
 export const REQUESTED_SCREEN_SHARE_HEIGHT = 1800;
 // 15fps is much nicer but takes up a lot more CPU.

ts/calling/constants.ts

@@ -100,6 +100,8 @@ import {
   REQUESTED_VIDEO_WIDTH,
   REQUESTED_VIDEO_HEIGHT,
   REQUESTED_VIDEO_FRAMERATE,
+  REQUESTED_GROUP_VIDEO_WIDTH,
+  REQUESTED_GROUP_VIDEO_HEIGHT,
   REQUESTED_SCREEN_SHARE_WIDTH,
   REQUESTED_SCREEN_SHARE_HEIGHT,
   REQUESTED_SCREEN_SHARE_FRAMERATE,
@@ -408,6 +410,18 @@ function getLogId(
   return `${source}(${idForLogging}${additionalText})`;
 }
 
+const DIRECT_CALL_OPTIONS: GumVideoCaptureOptions = {
+  maxWidth: REQUESTED_VIDEO_WIDTH,
+  maxHeight: REQUESTED_VIDEO_HEIGHT,
+  maxFramerate: REQUESTED_VIDEO_FRAMERATE,
+};
+
+const GROUP_CALL_OPTIONS: GumVideoCaptureOptions = {
+  maxWidth: REQUESTED_GROUP_VIDEO_WIDTH,
+  maxHeight: REQUESTED_GROUP_VIDEO_HEIGHT,
+  maxFramerate: REQUESTED_VIDEO_FRAMERATE,
+};
+
 export class CallingClass {
   readonly #videoCapturer: GumVideoCapturer;
 
@@ -436,11 +450,7 @@ export class CallingClass {
   #sendProfileKeysForAdhocCallCache: Set<AciString>;
 
   constructor() {
-    this.#videoCapturer = new GumVideoCapturer({
-      maxWidth: REQUESTED_VIDEO_WIDTH,
-      maxHeight: REQUESTED_VIDEO_HEIGHT,
-      maxFramerate: REQUESTED_VIDEO_FRAMERATE,
-    });
+    this.#videoCapturer = new GumVideoCapturer(DIRECT_CALL_OPTIONS);
     this.videoRenderer = new CanvasVideoRenderer();
 
     this.#callsLookup = {};
@@ -619,7 +629,7 @@ export class CallingClass {
     await this.#startDeviceReselectionTimer();
 
     const enableLocalCameraIfNecessary = hasLocalVideo
-      ? () => drop(this.enableLocalCamera())
+      ? () => drop(this.enableLocalCamera(callMode))
       : noop;
 
     switch (callMode) {
@@ -970,7 +980,7 @@ export class CallingClass {
     groupCall.setOutgoingVideoMuted(!hasLocalVideo);
 
     if (hasLocalVideo) {
-      drop(this.enableLocalCamera());
+      drop(this.enableLocalCamera(CallMode.Group));
     }
 
     return {
@@ -1394,7 +1404,7 @@ export class CallingClass {
 
     groupCall.setOutgoingAudioMuted(!hasLocalAudio);
     groupCall.setOutgoingVideoMuted(!hasLocalVideo);
-    drop(this.enableCaptureAndSend(groupCall, null, logId));
+    drop(this.enableCaptureAndSend(groupCall, undefined, logId));
 
     if (shouldRing) {
       groupCall.ringAll();
@@ -1469,7 +1479,7 @@ export class CallingClass {
           } else if (localDeviceState.videoMuted) {
             this.disableLocalVideo();
           } else {
-            drop(this.enableCaptureAndSend(groupCall, null, logId));
+            drop(this.enableCaptureAndSend(groupCall, undefined, logId));
           }
 
           // Call enters the Joined state, once per call.
@@ -2613,24 +2623,24 @@ export class CallingClass {
     RingRTC.setAudioOutput(device.index);
   }
 
-  async enableLocalCamera(): Promise<void> {
+  async enableLocalCamera(mode: CallMode): Promise<void> {
     await window.reduxActions.globalModals.ensureSystemMediaPermissions(
       'camera',
       'call'
     );
-    await this.#videoCapturer.enableCapture();
+
+    await this.#videoCapturer.enableCapture(
+      mode === CallMode.Direct ? undefined : GROUP_CALL_OPTIONS
+    );
   }
 
   async enableCaptureAndSend(
     call: GroupCall | Call,
-    options?: GumVideoCaptureOptions | null,
-    logId?: string
+    options = call instanceof GroupCall ? GROUP_CALL_OPTIONS : undefined,
+    logId = 'enableCaptureAndSend'
   ): Promise<void> {
     try {
-      await this.#videoCapturer.enableCaptureAndSend(
-        call,
-        options ?? undefined
-      );
+      await this.#videoCapturer.enableCaptureAndSend(call, options);
     } catch (err) {
       log.error(
         `${

ts/services/calling.ts

@@ -1946,7 +1946,7 @@ function setLocalVideo(
           payload.enabled
         );
       } else if (payload.enabled) {
-        await calling.enableLocalCamera();
+        await calling.enableLocalCamera(activeCall.callMode);
       } else {
         calling.disableLocalVideo();
       }