make scaling client persistent and applied on land

Author: thelamer

addons/gst-web-core/selkies-core.js

@@ -58,6 +58,7 @@ let wakeLockSentinel = null;
 let currentEncoderMode = 'x264enc-stiped';
 let useCssScaling = false;
 let trackpadMode = false;
+let scalingDPI = 96;
 function setRealViewportHeight() {
   const vh = window.innerHeight * 0.01;
   document.documentElement.style.setProperty('--vh', `${vh}px`);
@@ -267,6 +268,8 @@ useCssScaling = getBoolParam('useCssScaling', false);
 setBoolParam('useCssScaling', useCssScaling);
 trackpadMode = getBoolParam('trackpadMode', false);
 setBoolParam('trackpadMode', trackpadMode);
+scalingDPI = getIntParam('SCALING_DPI', 96);
+setIntParam('SCALING_DPI', scalingDPI);
 
 if (isSharedMode) {
     manualWidth = 1280;
@@ -1897,6 +1900,8 @@ function handleSettingsMessage(settings) {
   if (settings.SCALING_DPI !== undefined) {
     const dpi = parseInt(settings.SCALING_DPI, 10);
     if (!isNaN(dpi)) {
+      scalingDPI = dpi;
+      setIntParam('SCALING_DPI', scalingDPI);
       console.log(`Applied SCALING_DPI setting: ${dpi}.`);
       if (!isSharedMode && websocket && websocket.readyState === WebSocket.OPEN) {
         const message = `s,${dpi}`;
@@ -2597,6 +2602,7 @@ function handleDecodedFrame(frame) { // frame.codedWidth/Height are physical pix
           else if (unprefixedKey === 'h264_paintover_crf') serverExpectedKey = 'pixelflux_h264_paintover_crf';
           else if (unprefixedKey === 'h264_paintover_burst_frames') serverExpectedKey = 'pixelflux_h264_paintover_burst_frames';
           else if (unprefixedKey === 'use_paint_over_quality') serverExpectedKey = 'pixelflux_use_paint_over_quality';
+          else if (unprefixedKey === 'SCALING_DPI') serverExpectedKey = 'webrtc_SCALING_DPI';
 
           if (serverExpectedKey) {
             let value = localStorage.getItem(key);
@@ -2618,6 +2624,7 @@ function handleDecodedFrame(frame) { // frame.codedWidth/Height are physical pix
               'pixelflux_paint_over_jpeg_quality',
               'pixelflux_h264_paintover_crf',
               'pixelflux_h264_paintover_burst_frames',
+              'webrtc_SCALING_DPI',
             ];
             if (booleanSettingKeys.includes(serverExpectedKey)) {
               value = (value === 'true');

addons/selkies-dashboard/src/components/Sidebar.jsx

@@ -694,7 +694,7 @@ function Sidebar({ isOpen }) {
     localStorage.getItem(getPrefixedKey("h264_streaming_mode")) === "true"
   );
   const [selectedDpi, setSelectedDpi] = useState(
-    parseInt(localStorage.getItem("scalingDPI"), 10) || DEFAULT_SCALING_DPI
+    parseInt(localStorage.getItem(getPrefixedKey("SCALING_DPI")), 10) || DEFAULT_SCALING_DPI
   );
   const [manualWidth, setManualWidth] = useState(localStorage.getItem(getPrefixedKey("manualWidth")) || "");
   const [manualHeight, setManualHeight] = useState(localStorage.getItem(getPrefixedKey("manualHeight")) || "");

src/selkies/selkies.py

@@ -1584,6 +1584,7 @@ def get_str(k, d):
         parsed["h264_paintover_crf"] = get_int("pixelflux_h264_paintover_crf", self.h264_paintover_crf)
         parsed["h264_paintover_burst_frames"] = get_int("pixelflux_h264_paintover_burst_frames", self.h264_paintover_burst_frames)
         parsed["use_paint_over_quality"] = get_bool("pixelflux_use_paint_over_quality", self.use_paint_over_quality)
+        parsed["scaling_dpi"] = get_int("webrtc_SCALING_DPI", 96)
         data_logger.debug(f"Parsed client settings: {parsed}")
         return parsed
 
@@ -1695,6 +1696,23 @@ async def _apply_client_settings(
             if self.app.audio_bitrate != settings["audioBitRate"]:
                  self.app.audio_bitrate = settings["audioBitRate"]
 
+        if "scaling_dpi" in settings:
+            dpi_value = settings["scaling_dpi"]
+            data_logger.info(f"Applying SCALING_DPI from initial settings: {dpi_value}")
+            if await set_dpi(dpi_value):
+                data_logger.info(f"Successfully set DPI to {dpi_value} from initial settings.")
+            else:
+                data_logger.error(f"Failed to set DPI to {dpi_value} from initial settings.")
+
+            if CURSOR_SIZE > 0:
+                calculated_cursor_size = int(round(dpi_value / 96.0 * CURSOR_SIZE))
+                new_cursor_size = max(1, calculated_cursor_size)
+                data_logger.info(f"Attempting to set cursor size to {new_cursor_size} based on initial DPI.")
+                if await set_cursor_size(new_cursor_size):
+                    data_logger.info(f"Successfully set cursor size to {new_cursor_size}.")
+                else:
+                    data_logger.error(f"Failed to set cursor size to {new_cursor_size}.")
+
         if "videoBufferSize" in settings:
             setattr(self.app, "video_buffer_size", settings["videoBufferSize"])
         async with self._pipeline_lock: