Set different frame capture interval for H.264 and RFX

and pass them to xorgxrdp.
neutrinolabs · Nov 18, 2024 · c55694c · c55694c
1 parent 0579980
commit c55694c
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 1 deletion.
diff --git a/common/xrdp_client_info.h b/common/xrdp_client_info.h
@@ -241,6 +241,11 @@ struct xrdp_client_info
 
     int pad1; /* unused; unicode_input_state */
     enum xrdp_capture_code capture_code;
+
+    /* xorgxrdp: frame capture interval (milliseconds) */
+    int rfx_frame_interval;
+    int h264_frame_interval;
+    int normal_frame_interval;
 };
 
 enum xrdp_encoder_flags
@@ -260,6 +265,6 @@ enum xrdp_encoder_flags
 
 /* yyyymmdd of last incompatible change to xrdp_client_info */
 /* also used for changes to all the xrdp installed headers */
-#define CLIENT_INFO_CURRENT_VERSION 20240514
+#define CLIENT_INFO_CURRENT_VERSION 20241118
 
 #endif
diff --git a/common/xrdp_constants.h b/common/xrdp_constants.h
@@ -86,6 +86,11 @@
 #define MCS_SDRQ                       25 /* Send Data Request */
 #define MCS_SDIN                       26 /* Send Data Indication */
 
+/* xorgxrdp: frame capture interval (milliseconds) */
+#define RFX_FRAME_INTERVAL             32
+#define H264_FRAME_INTERVAL            16
+#define NORMAL_FRAME_INTERVAL          40
+
 /******************************************************************************
  *
  * Constants come from other Microsoft products

diff --git a/xrdp/xrdp.ini.in b/xrdp/xrdp.ini.in
@@ -242,6 +242,10 @@ username=ask
 password=ask
 port=-1
 code=20
+; Frame capture interval (milliseconds)
+h264_frame_interval=16
+rfx_frame_interval=32
+normal_frame_interval=40
 
 [Xvnc]
 name=Xvnc

diff --git a/xup/xup.c b/xup/xup.c
@@ -170,6 +170,22 @@ lib_mod_connect(struct mod *mod)
         return 1;
     }
 
+
+    // This is a good place to finalise any parameters that need to
+    // be set.
+    if (mod->client_info.h264_frame_interval <= 0)
+    {
+        mod->client_info.h264_frame_interval = H264_FRAME_INTERVAL;
+    }
+    if (mod->client_info.rfx_frame_interval <= 0)
+    {
+        mod->client_info.rfx_frame_interval = RFX_FRAME_INTERVAL;
+    }
+    if (mod->client_info.normal_frame_interval <= 0)
+    {
+        mod->client_info.normal_frame_interval = NORMAL_FRAME_INTERVAL;
+    }
+
     make_stream(s);
     g_sprintf(con_port, "%s", mod->port);
 
@@ -1855,6 +1871,18 @@ lib_mod_set_param(struct mod *mod, const char *name, const char *value)
     {
         g_strncpy(mod->port, value, 255);
     }
+    else if (g_strcasecmp(name, "h264_frame_interval") == 0)
+    {
+        mod->client_info.h264_frame_interval = g_atoi(value);
+    }
+    else if (g_strcasecmp(name, "rfx_frame_interval") == 0)
+    {
+        mod->client_info.rfx_frame_interval = g_atoi(value);
+    }
+    else if (g_strcasecmp(name, "normal_frame_interval") == 0)
+    {
+        mod->client_info.normal_frame_interval = g_atoi(value);
+    }
     else if (g_strcasecmp(name, "client_info") == 0)
     {
         g_memcpy(&(mod->client_info), value, sizeof(mod->client_info));