livedesk 0.1.420 → 0.1.421

package/hub/src/mode4-atlas-pool.js

@@ -20,6 +20,8 @@ export function planMode4AtlasInputTransitions(previous = {}, next = {}) {
   const captureSizeChanged = previousIds.size > 0
     && (Number(previous.tileWidth || 0) !== Number(next.tileWidth || 0)
       || Number(previous.tileHeight || 0) !== Number(next.tileHeight || 0));
+  const captureFpsChanged = previousIds.size > 0
+    && Number(previous.inputFps || 0) !== Number(next.inputFps || 0);
   const stop = [...previousIds].filter(deviceId => !nextIds.has(deviceId));
   const start = [];
   const restart = [];
@@ -32,7 +34,7 @@ export function planMode4AtlasInputTransitions(previous = {}, next = {}) {
     }
     const previousMonitorIndex = Number(previousMonitorSelections[deviceId] || 0);
     const nextMonitorIndex = Number(nextMonitorSelections[deviceId] || 0);
-    if (captureSizeChanged || previousMonitorIndex !== nextMonitorIndex) {
+    if (captureSizeChanged || captureFpsChanged || previousMonitorIndex !== nextMonitorIndex) {
       restart.push(deviceId);
     } else {
       unchanged.push(deviceId);

package/hub/src/server.js

@@ -2306,6 +2306,7 @@ function configureMode4Atlas(ws, payload = {}) {
   });
   const tileWidth = tileSize.width;
   const tileHeight = tileSize.height;
+  const inputFps = clampNumber(payload.inputFps, 1, 30, 8);
   const previousInputDeviceIds = ws.liveDeskAtlasInputDeviceIds instanceof Set
     ? new Set(ws.liveDeskAtlasInputDeviceIds)
     : new Set();
@@ -2339,16 +2340,18 @@ function configureMode4Atlas(ws, payload = {}) {
   }
   ws.liveDeskAtlasDeviceIds = new Set(deviceIds);
   ws.liveDeskAtlasInputDeviceIds = new Set(captureDeviceIds);
-  ws.liveDeskAtlasInputOptions = { tileWidth, tileHeight, monitorSelections };
+  ws.liveDeskAtlasInputOptions = { tileWidth, tileHeight, inputFps, monitorSelections };
   const inputTransitions = planMode4AtlasInputTransitions({
     inputDeviceIds: [...previousInputDeviceIds],
     tileWidth: previousInputOptions.tileWidth,
     tileHeight: previousInputOptions.tileHeight,
+    inputFps: previousInputOptions.inputFps,
     monitorSelections: previousInputOptions.monitorSelections
   }, {
     inputDeviceIds: captureDeviceIds,
     tileWidth,
     tileHeight,
+    inputFps,
     monitorSelections
   });
   for (const deviceId of inputTransitions.stop) {
@@ -2368,10 +2371,11 @@ function configureMode4Atlas(ws, payload = {}) {
     deviceIds,
     captureDeviceIds,
     inputMode: 'mode2-lzo',
-    outputMode: 'mode4-h264-atlas',
-    tileWidth,
-    tileHeight,
-    timestamp: new Date().toISOString()
+    outputMode: 'mode4-h264-atlas',
+    tileWidth,
+    tileHeight,
+    inputFps,
+    timestamp: new Date().toISOString()
   });
 }
 
@@ -2379,7 +2383,7 @@ function startMode4AtlasInput(ws, deviceId, reason = 'atlas-configure', { forceR
   const options = ws?.liveDeskAtlasInputOptions;
   if (!options || !ws.liveDeskAtlasInputDeviceIds?.has(deviceId)) return { ok: false, error: 'atlas-device-not-configured' };
   return remoteHub.startLiveStream(deviceId, {
-    fps: 8,
+    fps: options.inputFps,
     maxWidth: options.tileWidth,
     maxHeight: options.tileHeight,
     quality: 60,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.420",
+  "version": "0.1.421",
   "livedeskClientVersion": "0.1.182",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",