mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increase GFX output buffer size

Browse Source 
Size the GFX output buffer pessimistically based on the largest monitor
in the configuration.

(cherry picked from commit 90e4aca26a)
This commit is contained in:
matt335672 2024-02-27 10:03:33 +00:00 committed by Koichiro Iwao
parent ab2430ac76
commit d6cf81a4da
1 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
xrdp/xrdp_encoder.c
View File

@ -85,6 +85,40 @@ xrdp_enc_data_done_destructor(void *item, void *closure)
g_free(enc_done);
}
/*****************************************************************************/
static unsigned int
get_largest_monitor_pixels(struct xrdp_mm *mm)
{
unsigned int max_pixels;
struct xrdp_client_info *client_info = mm->wm->client_info;
struct display_size_description *display_sizes;
display_sizes = &client_info->display_sizes;
if (display_sizes->monitorCount < 1)
{
max_pixels = display_sizes->session_width *
display_sizes->session_height;
}
else
{
max_pixels = 0;
struct monitor_info *minfo = display_sizes->minfo;
unsigned int i;
for (i = 0 ; i < display_sizes->monitorCount; ++i)
{
unsigned int pixels = (minfo[i].right + 1) - minfo[i].left;
pixels *= (minfo[i].bottom + 1) - minfo[i].top;
if (pixels > max_pixels)
{
max_pixels = pixels;
}
}
}
return max_pixels;
}
/*****************************************************************************/
struct xrdp_encoder *
xrdp_encoder_create(struct xrdp_mm *mm)
@ -189,9 +223,12 @@ xrdp_encoder_create(struct xrdp_mm *mm)
self->xrdp_encoder_term = g_create_wait_obj(buf);
if (client_info->gfx)
{
// Magic numbers... Why?
// Assume compressor needs to cope with largest monitor with
// ineffective compression
self->frames_in_flight = 2;
self->max_compressed_bytes = 3145728;
self->max_compressed_bytes = get_largest_monitor_pixels(mm) * 4;
LOG_DEVEL(LOG_LEVEL_INFO, "Using %d max_compressed_bytes for encoder",
self->max_compressed_bytes);
}
else
{