From 98f63c71721be68bb63cd7b40b38a008184487c9 Mon Sep 17 00:00:00 2001
From: Ryan Emmick <ryanemmick4@gmail.com>
Date: Wed, 11 Feb 2026 12:26:16 -0600
Subject: [PATCH] Clean up: deduplicate settings UI, fix backupCodec, remove
 dead export

Signed-off-by: Ryan Emmick <ryanemmick4@gmail.com>
---
 src/livekit/options.ts                        |   8 +-
 src/settings/SettingsModal.tsx                | 242 +++++++-----------
 src/settings/settings.ts                      |   8 +
 .../CallViewModel/localMember/LocalMember.ts  |   5 +-
 .../remoteMembers/ConnectionFactory.ts        |   5 +-
 .../remoteMembers/ECConnectionFactory.test.ts |   7 +-
 6 files changed, 113 insertions(+), 162 deletions(-)

diff --git a/src/livekit/options.ts b/src/livekit/options.ts
index 8b98d6113..aac7ce583 100644
--- a/src/livekit/options.ts
+++ b/src/livekit/options.ts
@@ -108,7 +108,10 @@ function buildPublishOptions(
     stopMicTrackOnMute: false,
     videoCodec: codec,
     videoEncoding,
-    backupCodec: { codec: "vp8", encoding: videoEncoding },
+    backupCodec: {
+      codec: "vp8",
+      encoding: VideoPresets.h720.encoding,
+    },
   } as TrackPublishDefaults;
 }
 
@@ -156,6 +159,3 @@ export function getLiveKitOptions(): RoomOptions {
     return buildLiveKitOptions();
   }
 }
-
-// Keep backward-compatible export for existing consumers
-export const defaultLiveKitOptions: RoomOptions = buildLiveKitOptions();
diff --git a/src/settings/SettingsModal.tsx b/src/settings/SettingsModal.tsx
index 74e58e05d..8acc400d1 100644
--- a/src/settings/SettingsModal.tsx
+++ b/src/settings/SettingsModal.tsx
@@ -20,6 +20,7 @@ import { iosDeviceMenu$ } from "../state/MediaDevices";
 import { useMediaDevices } from "../MediaDevicesContext";
 import { widget } from "../widget";
 import {
+  type Setting,
   useSetting,
   soundEffectVolume as soundEffectVolumeSetting,
   backgroundBlur as backgroundBlurSetting,
@@ -112,33 +113,47 @@ export const SettingsModal: FC<Props> = ({
     );
   };
 
-  const ScreenShareSettings: React.FC = (): ReactNode => {
-    const [advancedEnabled, setAdvancedEnabled] = useSetting(
-      advancedScreenShareSetting,
-    );
-    const [resolution, setResolution] = useSetting(
-      screenShareResolutionSetting,
-    );
-    const [framerate, setFramerate] = useSetting(screenShareFramerateSetting);
+  const MediaQualitySettings: React.FC<{
+    id: string;
+    header: string;
+    toggleLabel: string;
+    description: string;
+    toggleSetting: Setting<boolean>;
+    resolutionSetting: Setting<string>;
+    framerateSetting: Setting<number>;
+    bitrateSetting: Setting<number>;
+    codecSetting: Setting<VideoCodec>;
+    resolutionOptions: { value: string; label: string }[];
+    bitrateRange: { min: number; max: number; step: number };
+  }> = ({
+    id,
+    header,
+    toggleLabel,
+    description,
+    toggleSetting,
+    resolutionSetting,
+    framerateSetting,
+    bitrateSetting,
+    codecSetting,
+    resolutionOptions,
+    bitrateRange,
+  }): ReactNode => {
+    const [advancedEnabled, setAdvancedEnabled] = useSetting(toggleSetting);
+    const [resolution, setResolution] = useSetting(resolutionSetting);
+    const [framerate, setFramerate] = useSetting(framerateSetting);
     const [framerateRaw, setFramerateRaw] = useState(framerate);
-    const [bitrate, setBitrate] = useSetting(screenShareBitrateSetting);
+    const [bitrate, setBitrate] = useSetting(bitrateSetting);
     const [bitrateRaw, setBitrateRaw] = useState(bitrate);
-    const [codec, setCodec] = useSetting(screenShareCodecSetting);
+    const [codec, setCodec] = useSetting(codecSetting);
 
     return (
       <>
-        <h4>{t("settings.screen_share_header", "Screen sharing")}</h4>
+        <h4>{header}</h4>
         <FieldRow>
           <InputField
-            id="advancedScreenShare"
-            label={t(
-              "settings.advanced_screen_share_label",
-              "Advanced screen share settings",
-            )}
-            description={t(
-              "settings.advanced_screen_share_description",
-              "Configure resolution, framerate, bitrate, and codec for screen sharing",
-            )}
+            id={`${id}Toggle`}
+            label={toggleLabel}
+            description={description}
             type="checkbox"
             checked={advancedEnabled}
             onChange={(e): void => setAdvancedEnabled(e.target.checked)}
@@ -147,29 +162,29 @@ export const SettingsModal: FC<Props> = ({
         {advancedEnabled && (
           <>
             <div className={styles.volumeSlider}>
-              <label htmlFor="screenShareResolution">
-                {t("settings.screen_share_resolution_label", "Resolution")}
+              <label htmlFor={`${id}Resolution`}>
+                {t("settings.resolution_label", "Resolution")}
               </label>
               <select
-                id="screenShareResolution"
+                id={`${id}Resolution`}
                 value={resolution}
                 onChange={(e): void => setResolution(e.target.value)}
               >
-                <option value="1024x576">576p</option>
-                <option value="1280x720">720p</option>
-                <option value="1920x1080">1080p</option>
-                <option value="2560x1440">1440p</option>
-                <option value="3840x2160">4K</option>
+                {resolutionOptions.map((opt) => (
+                  <option key={opt.value} value={opt.value}>
+                    {opt.label}
+                  </option>
+                ))}
               </select>
             </div>
             <div className={styles.volumeSlider}>
               <label>
-                {t("settings.screen_share_framerate_label", "Framerate")}
+                {t("settings.framerate_label", "Framerate")}
                 {": "}
                 <span className={styles.settingValue}>{framerateRaw} fps</span>
               </label>
               <Slider
-                label={t("settings.screen_share_framerate_label", "Framerate")}
+                label={t("settings.framerate_label", "Framerate")}
                 value={framerateRaw}
                 onValueChange={setFramerateRaw}
                 onValueCommit={setFramerate}
@@ -181,142 +196,31 @@ export const SettingsModal: FC<Props> = ({
             </div>
             <div className={styles.volumeSlider}>
               <label>
-                {t("settings.screen_share_bitrate_label", "Bitrate")}
+                {t("settings.bitrate_label", "Bitrate")}
                 {": "}
                 <span className={styles.settingValue}>
                   {(bitrateRaw / 1_000_000).toFixed(1)} Mbps
                 </span>
               </label>
               <Slider
-                label={t("settings.screen_share_bitrate_label", "Bitrate")}
+                label={t("settings.bitrate_label", "Bitrate")}
                 value={bitrateRaw}
                 onValueChange={setBitrateRaw}
                 onValueCommit={setBitrate}
-                min={500_000}
-                max={15_000_000}
-                step={500_000}
+                min={bitrateRange.min}
+                max={bitrateRange.max}
+                step={bitrateRange.step}
                 tooltipFormatter={(v): string =>
                   `${(v / 1_000_000).toFixed(1)} Mbps`
                 }
               />
             </div>
             <div className={styles.volumeSlider}>
-              <label htmlFor="screenShareCodec">
-                {t("settings.screen_share_codec_label", "Codec")}
+              <label htmlFor={`${id}Codec`}>
+                {t("settings.codec_label", "Codec")}
               </label>
               <select
-                id="screenShareCodec"
-                value={codec}
-                onChange={(e): void =>
-                  setCodec(e.target.value as VideoCodec)
-                }
-              >
-                <option value="vp8">VP8</option>
-                <option value="vp9">VP9</option>
-                <option value="h264">H.264</option>
-                <option value="av1">AV1</option>
-              </select>
-            </div>
-          </>
-        )}
-      </>
-    );
-  };
-
-  const CameraSettings: React.FC = (): ReactNode => {
-    const [advancedEnabled, setAdvancedEnabled] = useSetting(
-      advancedCameraSetting,
-    );
-    const [resolution, setResolution] = useSetting(cameraResolutionSetting);
-    const [framerate, setFramerate] = useSetting(cameraFramerateSetting);
-    const [framerateRaw, setFramerateRaw] = useState(framerate);
-    const [bitrate, setBitrate] = useSetting(cameraBitrateSetting);
-    const [bitrateRaw, setBitrateRaw] = useState(bitrate);
-    const [codec, setCodec] = useSetting(cameraCodecSetting);
-
-    return (
-      <>
-        <h4>{t("settings.camera_header", "Camera quality")}</h4>
-        <FieldRow>
-          <InputField
-            id="advancedCamera"
-            label={t(
-              "settings.advanced_camera_label",
-              "Advanced camera settings",
-            )}
-            description={t(
-              "settings.advanced_camera_description",
-              "Configure resolution, framerate, bitrate, and codec for camera video. Changes apply on next call join.",
-            )}
-            type="checkbox"
-            checked={advancedEnabled}
-            onChange={(e): void => setAdvancedEnabled(e.target.checked)}
-          />
-        </FieldRow>
-        {advancedEnabled && (
-          <>
-            <div className={styles.volumeSlider}>
-              <label htmlFor="cameraResolution">
-                {t("settings.camera_resolution_label", "Resolution")}
-              </label>
-              <select
-                id="cameraResolution"
-                value={resolution}
-                onChange={(e): void => setResolution(e.target.value)}
-              >
-                <option value="640x360">360p</option>
-                <option value="960x540">540p</option>
-                <option value="1280x720">720p</option>
-                <option value="1920x1080">1080p</option>
-                <option value="2560x1440">1440p</option>
-              </select>
-            </div>
-            <div className={styles.volumeSlider}>
-              <label>
-                {t("settings.camera_framerate_label", "Framerate")}
-                {": "}
-                <span className={styles.settingValue}>
-                  {framerateRaw} fps
-                </span>
-              </label>
-              <Slider
-                label={t("settings.camera_framerate_label", "Framerate")}
-                value={framerateRaw}
-                onValueChange={setFramerateRaw}
-                onValueCommit={setFramerate}
-                min={5}
-                max={60}
-                step={5}
-                tooltipFormatter={(v): string => `${v} fps`}
-              />
-            </div>
-            <div className={styles.volumeSlider}>
-              <label>
-                {t("settings.camera_bitrate_label", "Bitrate")}
-                {": "}
-                <span className={styles.settingValue}>
-                  {(bitrateRaw / 1_000_000).toFixed(1)} Mbps
-                </span>
-              </label>
-              <Slider
-                label={t("settings.camera_bitrate_label", "Bitrate")}
-                value={bitrateRaw}
-                onValueChange={setBitrateRaw}
-                onValueCommit={setBitrate}
-                min={200_000}
-                max={8_000_000}
-                step={100_000}
-                tooltipFormatter={(v): string =>
-                  `${(v / 1_000_000).toFixed(1)} Mbps`
-                }
-              />
-            </div>
-            <div className={styles.volumeSlider}>
-              <label htmlFor="cameraCodec">
-                {t("settings.camera_codec_label", "Codec")}
-              </label>
-              <select
-                id="cameraCodec"
+                id={`${id}Codec`}
                 value={codec}
                 onChange={(e): void =>
                   setCodec(e.target.value as VideoCodec)
@@ -488,9 +392,45 @@ export const SettingsModal: FC<Props> = ({
         <Separator />
         <BlurCheckbox />
         <Separator />
-        <CameraSettings />
+        <MediaQualitySettings
+          id="camera"
+          header={t("settings.camera_header", "Camera quality")}
+          toggleLabel={t("settings.advanced_camera_label", "Advanced camera settings")}
+          description={t("settings.advanced_camera_description", "Configure resolution, framerate, bitrate, and codec for camera video. Changes apply on next call join.")}
+          toggleSetting={advancedCameraSetting}
+          resolutionSetting={cameraResolutionSetting}
+          framerateSetting={cameraFramerateSetting}
+          bitrateSetting={cameraBitrateSetting}
+          codecSetting={cameraCodecSetting}
+          resolutionOptions={[
+            { value: "640x360", label: "360p" },
+            { value: "960x540", label: "540p" },
+            { value: "1280x720", label: "720p" },
+            { value: "1920x1080", label: "1080p" },
+            { value: "2560x1440", label: "1440p" },
+          ]}
+          bitrateRange={{ min: 200_000, max: 8_000_000, step: 100_000 }}
+        />
         <Separator />
-        <ScreenShareSettings />
+        <MediaQualitySettings
+          id="screenShare"
+          header={t("settings.screen_share_header", "Screen sharing")}
+          toggleLabel={t("settings.advanced_screen_share_label", "Advanced screen share settings")}
+          description={t("settings.advanced_screen_share_description", "Configure resolution, framerate, bitrate, and codec for screen sharing")}
+          toggleSetting={advancedScreenShareSetting}
+          resolutionSetting={screenShareResolutionSetting}
+          framerateSetting={screenShareFramerateSetting}
+          bitrateSetting={screenShareBitrateSetting}
+          codecSetting={screenShareCodecSetting}
+          resolutionOptions={[
+            { value: "1024x576", label: "576p" },
+            { value: "1280x720", label: "720p" },
+            { value: "1920x1080", label: "1080p" },
+            { value: "2560x1440", label: "1440p" },
+            { value: "3840x2160", label: "4K" },
+          ]}
+          bitrateRange={{ min: 500_000, max: 15_000_000, step: 500_000 }}
+        />
       </>
     ),
   };
diff --git a/src/settings/settings.ts b/src/settings/settings.ts
index 1ec26db60..48f5ee55c 100644
--- a/src/settings/settings.ts
+++ b/src/settings/settings.ts
@@ -166,6 +166,14 @@ export const customLivekitUrl = new Setting<string | null>(
 
 export type VideoCodec = "vp8" | "vp9" | "h264" | "av1";
 
+/**
+ * Parse a "WIDTHxHEIGHT" resolution string into numeric width and height.
+ */
+export function parseResolution(res: string): { width: number; height: number } {
+  const [w, h] = res.split("x").map(Number);
+  return { width: w, height: h };
+}
+
 export const advancedScreenShare = new Setting<boolean>(
   "advanced-screen-share",
   false,
diff --git a/src/state/CallViewModel/localMember/LocalMember.ts b/src/state/CallViewModel/localMember/LocalMember.ts
index 7a954ae73..002dba6b8 100644
--- a/src/state/CallViewModel/localMember/LocalMember.ts
+++ b/src/state/CallViewModel/localMember/LocalMember.ts
@@ -61,6 +61,7 @@ import {
   screenShareFramerate,
   screenShareBitrate,
   screenShareCodec,
+  parseResolution,
 } from "../../../settings/settings.ts";
 import { Config } from "../../../config/Config.ts";
 import {
@@ -688,9 +689,7 @@ export const createLocalMembership$ = ({
 
       if (advancedScreenShare.getValue()) {
         // User has advanced screen share settings enabled
-        const resParts = screenShareResolution.getValue().split("x");
-        const width = Number(resParts[0]);
-        const height = Number(resParts[1]);
+        const { width, height } = parseResolution(screenShareResolution.getValue());
         const fps = screenShareFramerate.getValue();
         const bps = screenShareBitrate.getValue();
         const codec = screenShareCodec.getValue();
diff --git a/src/state/CallViewModel/remoteMembers/ConnectionFactory.ts b/src/state/CallViewModel/remoteMembers/ConnectionFactory.ts
index 6192e8437..0a0bd7529 100644
--- a/src/state/CallViewModel/remoteMembers/ConnectionFactory.ts
+++ b/src/state/CallViewModel/remoteMembers/ConnectionFactory.ts
@@ -34,6 +34,7 @@ import {
   cameraFramerate,
   cameraBitrate,
   cameraCodec,
+  parseResolution,
   echoCancellationSetting,
   noiseSuppressionSetting,
   autoGainControlSetting,
@@ -150,9 +151,7 @@ function generateRoomOption({
   let publishDefaults = liveKitOptions.publishDefaults;
 
   if (advancedCamera.getValue()) {
-    const resParts = cameraResolution.getValue().split("x");
-    const width = Number(resParts[0]);
-    const height = Number(resParts[1]);
+    const { width, height } = parseResolution(cameraResolution.getValue());
     const fps = cameraFramerate.getValue();
     const bps = cameraBitrate.getValue();
     const codec = cameraCodec.getValue();
diff --git a/src/state/CallViewModel/remoteMembers/ECConnectionFactory.test.ts b/src/state/CallViewModel/remoteMembers/ECConnectionFactory.test.ts
index f4d86e51f..cf955f2cd 100644
--- a/src/state/CallViewModel/remoteMembers/ECConnectionFactory.test.ts
+++ b/src/state/CallViewModel/remoteMembers/ECConnectionFactory.test.ts
@@ -25,6 +25,7 @@ import { constant } from "../../Behavior";
 import {
   echoCancellationSetting,
   noiseSuppressionSetting,
+  autoGainControlSetting,
 } from "../../../settings/settings.ts";
 
 // At the top of your test file, after imports
@@ -105,9 +106,13 @@ describe("ECConnectionFactory - ControlledAudioDevice", () => {
   test.each([{ controlled: true }, { controlled: false }])(
     "it sets controlledAudioDevice=$controlled then uses deviceId accordingly",
     ({ controlled }) => {
-      // test("it sets echoCancellation and noiseSuppression based on constructor parameters", () => {
       const RoomConstructor = vi.mocked(LivekitRoom);
 
+      // Explicitly set audio settings so the test doesn't depend on defaults
+      echoCancellationSetting.setValue(true);
+      noiseSuppressionSetting.setValue(true);
+      autoGainControlSetting.setValue(true);
+
       const ecConnectionFactory = new ECConnectionFactory(
         mockClient,
         "!roomid:example.org",