Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set different frame capture interval for H.264 and RFX #3318

Merged
merged 3 commits into from
Nov 21, 2024
Merged

Set different frame capture interval for H.264 and RFX #3318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fb59a7
Set different frame capture interval for H.264 and RFX
metalefty Nov 15, 2024
7214afb
Add DEFAULT_ prefix for default frame capture intervals
metalefty Nov 19, 2024
1964dab
Frame capture intervals are not private to xrdp
metalefty Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion common/xrdp_client_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,11 @@ struct xrdp_client_info
int x11_keycode_num_lock;
int x11_keycode_scroll_lock;

/* xorgxrdp: frame capture interval (milliseconds) */
int rfx_frame_interval;
int h264_frame_interval;
int normal_frame_interval;

/* ==================================================================== */
/* Private to xrdp below this line */
/* ==================================================================== */
Expand Down Expand Up @@ -274,6 +279,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 20240805
#define CLIENT_INFO_CURRENT_VERSION 20241118

#endif
5 changes: 5 additions & 0 deletions common/xrdp_constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@
#define MCS_SDRQ 25 /* Send Data Request */
#define MCS_SDIN 26 /* Send Data Indication */

/* xorgxrdp: frame capture interval (milliseconds) */
#define DEFAULT_RFX_FRAME_INTERVAL 32
#define DEFAULT_H264_FRAME_INTERVAL 16
#define DEFAULT_NORMAL_FRAME_INTERVAL 40

/******************************************************************************
*
* Constants come from other Microsoft products
Expand Down
4 changes: 4 additions & 0 deletions xrdp/xrdp.ini.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,10 @@ password=ask
port=-1
code=20
#keycode_set=evdev
; Frame capture interval (milliseconds)
h264_frame_interval=16
rfx_frame_interval=32
normal_frame_interval=40

[Xvnc]
name=Xvnc
Expand Down
25 changes: 25 additions & 0 deletions xup/xup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,19 @@ lib_mod_connect(struct mod *mod)
LOG(LOG_LEVEL_INFO, "XKB rules '%s' will be used by the module",
mod->client_info.xkb_rules);

if (mod->client_info.h264_frame_interval <= 0)
{
mod->client_info.h264_frame_interval = DEFAULT_H264_FRAME_INTERVAL;
}
if (mod->client_info.rfx_frame_interval <= 0)
{
mod->client_info.rfx_frame_interval = DEFAULT_RFX_FRAME_INTERVAL;
}
if (mod->client_info.normal_frame_interval <= 0)
{
mod->client_info.normal_frame_interval = DEFAULT_NORMAL_FRAME_INTERVAL;
}

make_stream(s);
g_sprintf(con_port, "%s", mod->port);

Expand Down Expand Up @@ -1887,6 +1900,18 @@ lib_mod_set_param(struct mod *mod, const char *name, const char *value)
{
g_snprintf(mod->keycode_set, sizeof(mod->keycode_set), "%s", value);
}
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));
Expand Down