small optimizations + allow for users to force software H264 since it's not slow as balls

2026-07-06 14:00:34 -05:00
parent e0394ea1fa
commit f7e9da26f8
11 changed files with 171 additions and 27 deletions
@@ -70,6 +70,7 @@ import { createSharedUiSettingsSaver, loadSharedUiSettings } from "./shared-ui-s
  const qualitySlider = document.getElementById("qualitySlider");
  const qualityValue = document.getElementById("qualityValue");
  const codecH264 = document.getElementById("codecH264");
+  const softwareH264Ctrl = document.getElementById("softwareH264Ctrl");
  const codecMode = document.getElementById("codecMode");
  const canvas = document.getElementById("frameCanvas");
  const canvasContainer = document.getElementById("canvasContainer");
@@ -403,6 +404,7 @@ import { createSharedUiSettingsSaver, loadSharedUiSettings } from "./shared-ui-s
    if (kbdCtrl && typeof settings.keyboard === "boolean") kbdCtrl.checked = settings.keyboard;
    if (cursorCtrl && typeof settings.cursor === "boolean") cursorCtrl.checked = settings.cursor;
    if (duplicationCtrl && typeof settings.duplication === "boolean") duplicationCtrl.checked = settings.duplication;
+    if (softwareH264Ctrl && typeof settings.softwareH264 === "boolean") softwareH264Ctrl.checked = settings.softwareH264;
    if (clipboardSyncCtrl && typeof settings.clipboardSync === "boolean") clipboardSyncCtrl.checked = settings.clipboardSync;
    if (audioCtrl && typeof settings.audio === "boolean") audioCtrl.checked = settings.audio;
    if (typeof settings.preferH264 === "boolean") {
@@ -423,6 +425,7 @@ import { createSharedUiSettingsSaver, loadSharedUiSettings } from "./shared-ui-s
      keyboard: !!kbdCtrl?.checked,
      cursor: !!cursorCtrl?.checked,
      duplication: !!duplicationCtrl?.checked,
+      softwareH264: !!softwareH264Ctrl?.checked,
      clipboardSync: !!clipboardSyncCtrl?.checked,
      audio: !!audioCtrl?.checked,
      audioTransport: getAudioTransport(),
@@ -439,6 +442,9 @@ import { createSharedUiSettingsSaver, loadSharedUiSettings } from "./shared-ui-s
    codecH264.checked = prefersH264;
    codecH264.disabled = typeof VideoDecoder !== "function";
  }
+  if (softwareH264Ctrl) {
+    softwareH264Ctrl.disabled = !prefersH264;
+  }

  function setCodecModeLabel(mode, detail) {
    if (!codecMode) return;
@@ -1216,12 +1222,17 @@ import { createSharedUiSettingsSaver, loadSharedUiSettings } from "./shared-ui-s
  function pushQuality(val) {
    const q = Number(val) || 90;
    const codec = q >= 100 ? "raw" : (prefersH264 ? "h264" : "jpeg");
-    console.debug("rd: pushQuality val=", val, "q=", q, "codec=", codec);
+    const softwareH264 = codec === "h264" && useSoftwareH264();
+    console.debug("rd: pushQuality val=", val, "q=", q, "codec=", codec, "softwareH264=", softwareH264);
    setCodecModeLabel(codec, "requested");
-    if (codec === "h264") {
+    if (codec === "h264" && !softwareH264) {
      ensureDuplicationForH264();
    }
-    sendCmd("desktop_set_quality", { quality: q, codec });
+    sendCmd("desktop_set_quality", { quality: q, codec, softwareH264 });
+  }
+
+  function useSoftwareH264() {
+    return !!softwareH264Ctrl?.checked && prefersH264;
  }

  function ensureDuplicationForH264() {
@@ -1236,7 +1247,10 @@ import { createSharedUiSettingsSaver, loadSharedUiSettings } from "./shared-ui-s
    codecH264.addEventListener("change", function () {
      resetH264SessionState();
      prefersH264 = !!codecH264.checked && typeof VideoDecoder === "function";
-      if (prefersH264) {
+      if (softwareH264Ctrl) {
+        softwareH264Ctrl.disabled = !prefersH264;
+      }
+      if (prefersH264 && !useSoftwareH264()) {
        ensureDuplicationForH264();
      }
      if (!prefersH264) {
@@ -1249,6 +1263,15 @@ import { createSharedUiSettingsSaver, loadSharedUiSettings } from "./shared-ui-s
      sharedSettingsSaver.scheduleSave();
    });
  }
+  if (softwareH264Ctrl) {
+    softwareH264Ctrl.addEventListener("change", function () {
+      resetH264SessionState();
+      if (qualitySlider) {
+        pushQuality(qualitySlider.value);
+      }
+      sharedSettingsSaver.scheduleSave();
+    });
+  }

  function pushResolution() {
    if (resolutionSelect) {
@@ -1335,7 +1358,7 @@ import { createSharedUiSettingsSaver, loadSharedUiSettings } from "./shared-ui-s
    if (qualitySlider) {
      pushQuality(qualitySlider.value);
    }
-    if (prefersH264) {
+    if (prefersH264 && !useSoftwareH264()) {
      ensureDuplicationForH264();
    }
    pushTargetFps();
@@ -1588,6 +1611,7 @@ import { createSharedUiSettingsSaver, loadSharedUiSettings } from "./shared-ui-s
    prefersH264 = false;
    destroyVideoDecoder();
    if (codecH264) codecH264.checked = false;
+    if (softwareH264Ctrl) softwareH264Ctrl.disabled = true;
    sharedSettingsSaver.scheduleSave();
    console.warn("rd: falling back to jpeg codec", reasonText);
    const q = Number(qualitySlider?.value) || 90;
@@ -1636,6 +1660,7 @@ import { createSharedUiSettingsSaver, loadSharedUiSettings } from "./shared-ui-s
      sendCmd("desktop_set_quality", {
        quality: q,
        codec: "h264",
+        softwareH264: useSoftwareH264(),
        source: "rd_viewer",
        reason: "h264_recovery_quality_push",
      });
@@ -198,6 +198,9 @@
                  </label>
                  <span id="codecMode" class="pill pill-ghost text-slate-100 text-xs">Codec: auto</span>
                </div>
+                <label class="mt-2 flex items-center gap-2 text-sm text-slate-200" title="Skip NVENC/direct GPU H.264 and use the software H.264 fallback path">
+                  <input type="checkbox" id="softwareH264Ctrl" /> Software H.264
+                </label>
                <label class="mt-2 flex items-center gap-2 text-sm text-slate-200" title="Use GPU desktop duplication (Windows only)">
                  <input type="checkbox" id="duplicationCtrl" /> GPU Capture
                </label>