GFX: configurable x264 parameters

tests/xrdp/Makefile.am

@@ -1,5 +1,6 @@
 AM_CPPFLAGS = \
   -DXRDP_TOP_SRCDIR=\"$(top_srcdir)\" \
+  -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -I$(top_builddir) \
   -I$(top_srcdir)/xrdp \
   -I$(top_srcdir)/libxrdp \
@@ -31,6 +32,7 @@ test_xrdp_SOURCES = \
     test_xrdp_egfx.c \
     test_xrdp_keymap.c \
     test_xrdp_region.c \
+    test_tconfig.c \
     test_bitmap_load.c
 
 test_xrdp_CFLAGS = \
@@ -59,6 +61,7 @@ test_xrdp_LDADD = \
     $(top_builddir)/xrdp/xrdp_encoder.o \
     $(top_builddir)/xrdp/xrdp_process.o \
     $(top_builddir)/xrdp/xrdp_login_wnd.o \
+    $(top_builddir)/xrdp/xrdp_tconfig.o \
     $(top_builddir)/xrdp/xrdp_main_utils.o \
     $(top_builddir)/libpainter/src/libpainter.la \
     $(top_builddir)/librfxcodec/src/librfxencode.la \
@@ -69,3 +72,10 @@ test_xrdp_LDADD = \
     $(IMLIB2_LIBS) \
     @CHECK_LIBS@ \
     @CMOCKA_LIBS@
+
+if XRDP_X264
+AM_CPPFLAGS += -DXRDP_X264 $(XRDP_X264_CFLAGS)
+test_xrdp_LDADD += \
+    $(top_builddir)/xrdp/xrdp_encoder_x264.o \
+    $(XRDP_X264_LIBS)
+endif

tests/xrdp/test_tconfig.c

@@ -0,0 +1,50 @@
+#if defined(HAVE_CONFIG_H)
+#include "config_ac.h"
+#endif
+
+#include "xrdp_tconfig.h"
+#include "test_xrdp.h"
+#include "xrdp.h"
+
+START_TEST(test_tconfig_gfx_always_success)
+{
+    ck_assert_int_eq(1, 1);
+}
+END_TEST
+
+START_TEST(test_tconfig_gfx_x264_load_basic)
+{
+    struct xrdp_tconfig_gfx gfxconfig;
+    int rv = tconfig_load_gfx(XRDP_TOP_SRCDIR "/xrdp/gfx.toml", &gfxconfig);
+
+    ck_assert_int_eq(rv, 0);
+
+    /* default */
+    ck_assert_str_eq(gfxconfig.x264_param[0].preset, "ultrafast");
+    ck_assert_str_eq(gfxconfig.x264_param[0].tune, "zerolatency");
+    ck_assert_str_eq(gfxconfig.x264_param[0].profile, "main");
+    ck_assert_int_eq(gfxconfig.x264_param[0].vbv_max_bitrate, 0);
+    ck_assert_int_eq(gfxconfig.x264_param[0].vbv_buffer_size, 0);
+    ck_assert_int_eq(gfxconfig.x264_param[0].fps_num, 24);
+    ck_assert_int_eq(gfxconfig.x264_param[0].fps_den, 1);
+
+}
+END_TEST
+
+/******************************************************************************/
+Suite *
+make_suite_tconfig_load_gfx(void)
+{
+    Suite *s;
+    TCase *tc_tconfig_load_gfx;
+
+    s = suite_create("GfxLoad");
+
+    tc_tconfig_load_gfx = tcase_create("xrdp_tconfig_load_gfx");
+    tcase_add_test(tc_tconfig_load_gfx, test_tconfig_gfx_always_success);
+    tcase_add_test(tc_tconfig_load_gfx, test_tconfig_gfx_x264_load_basic);
+
+    suite_add_tcase(s, tc_tconfig_load_gfx);
+
+    return s;
+}

tests/xrdp/test_xrdp.h

@@ -7,5 +7,6 @@ Suite *make_suite_test_bitmap_load(void);
 Suite *make_suite_test_keymap_load(void);
 Suite *make_suite_egfx_base_functions(void);
 Suite *make_suite_region(void);
+Suite *make_suite_tconfig_load_gfx(void);
 
 #endif /* TEST_XRDP_H */

tests/xrdp/test_xrdp_main.c

@@ -58,6 +58,7 @@ int main (void)
     srunner_add_suite(sr, make_suite_test_keymap_load());
     srunner_add_suite(sr, make_suite_egfx_base_functions());
     srunner_add_suite(sr, make_suite_region());
+    srunner_add_suite(sr, make_suite_tconfig_load_gfx());
 
     srunner_set_tap(sr, "-");
     srunner_run_all (sr, CK_ENV);

xrdp/Makefile.am

@@ -73,6 +73,8 @@ xrdp_SOURCES = \
   xrdp_egfx.h \
   xrdp_wm.c \
   xrdp_main_utils.c \
+  xrdp_tconfig.c \
+  xrdp_tconfig.h \
   $(XRDP_EXTRA_SOURCES)
 
 xrdp_LDADD = \
@@ -103,6 +105,7 @@ SUFFIXES = .in
 	$(subst_verbose)$(SUBST_VARS) $< > $@
 
 dist_xrdpsysconf_DATA = \
+  gfx.toml \
   xrdp_keyboard.ini
 
 nodist_xrdpsysconf_DATA = \

xrdp/gfx.toml

@@ -0,0 +1,37 @@
+[x264.default]
+preset = "ultrafast"
+tune = "zerolatency"
+profile = "main"     # profile is forced to baseline if preset == ultrafast
+vbv_max_bitrate = 0
+vbv_buffer_size = 0
+fps_num = 24
+fps_den = 1
+
+[x264.lan]
+# inherits default
+
+[x264.wan]
+vbv_max_bitrate = 15000
+vbv_buffer_size = 1500
+
+[x264.broadband_high]
+preset = "superfast"
+vbv_max_bitrate = 8000
+vbv_buffer_Size = 800
+
+[x264.satellite]
+preset = "superfast"
+vbv_max_bitrate = 5000
+vbv_buffer_size = 500
+
+[x264.broadband_low]
+preset = "veryfast"
+tune = "zerolatency"
+vbv_max_bitrate = 1600
+vbv_buffer_size = 66
+
+[x264.modem]
+preset = "fast"
+tune = "zerolatency"
+vbv_max_bitrate = 1200
+vbv_buffer_size = 50

xrdp/xrdp_encoder.c

@@ -759,6 +759,9 @@ gfx_wiretosurface1(struct xrdp_encoder *self,
     short *crects;
     struct xrdp_enc_gfx_cmd *enc_gfx_cmd = &(enc->u.gfx);
     int mon_index;
+    int connection_type;
+
+    connection_type = self->mm->wm->client_info->mcs_connection_type;
 
     s = &ls;
     g_memset(s, 0, sizeof(struct stream));
@@ -912,7 +915,8 @@ gfx_wiretosurface1(struct xrdp_encoder *self,
                     width, height, twidth, theight, 0,
                     enc_gfx_cmd->data,
                     crects, num_rects_c,
-                    s->p, &bitmap_data_length, NULL);
+                    s->p, &bitmap_data_length,
+                    connection_type, NULL);
         if (error == 0)
         {
             xstream_seek(s, bitmap_data_length);

xrdp/xrdp_encoder_x264.c

@@ -32,6 +32,7 @@
 #include "arch.h"
 #include "os_calls.h"
 #include "xrdp_encoder_x264.h"
+#include "xrdp_tconfig.h"
 
 #define X264_MAX_ENCODERS 16
 
@@ -47,14 +48,25 @@ struct x264_encoder
 struct x264_global
 {
     struct x264_encoder encoders[X264_MAX_ENCODERS];
+    struct xrdp_tconfig_gfx_x264_param x264_param[NUM_CONNECTION_TYPES];
 };
 
 /*****************************************************************************/
 void *
 xrdp_encoder_x264_create(void)
 {
     LOG_DEVEL(LOG_LEVEL_TRACE, "xrdp_encoder_x264_create:");
-    return g_new0(struct x264_global, 1);
+
+    struct x264_global *xg;
+    struct xrdp_tconfig_gfx gfxconfig;
+    xg = g_new0(struct x264_global, 1);
+    tconfig_load_gfx(GFX_CONF, &gfxconfig);
+
+    memcpy(&xg->x264_param, &gfxconfig.x264_param,
+           sizeof(struct xrdp_tconfig_gfx_x264_param) * NUM_CONNECTION_TYPES);
+
+    return xg;
+
 }
 
 /*****************************************************************************/
@@ -89,7 +101,8 @@ xrdp_encoder_x264_encode(void *handle, int session, int left, int top,
                          int width, int height, int twidth, int theight,
                          int format, const char *data,
                          short *crects, int num_crects,
-                         char *cdata, int *cdata_bytes, int *flags_ptr)
+                         char *cdata, int *cdata_bytes, int connection_type,
+                         int *flags_ptr)
 {
     struct x264_global *xg;
     struct x264_encoder *xe;
@@ -105,6 +118,7 @@ xrdp_encoder_x264_encode(void *handle, int session, int left, int top,
     int y;
     int cx;
     int cy;
+    int ct; /* connection_type */
 
     x264_picture_t pic_in;
     x264_picture_t pic_out;
@@ -113,6 +127,14 @@ xrdp_encoder_x264_encode(void *handle, int session, int left, int top,
     flags = 0;
     xg = (struct x264_global *) handle;
     xe = &(xg->encoders[session % X264_MAX_ENCODERS]);
+
+    /* validate connection type */
+    ct = connection_type;
+    if (ct > CONNECTION_TYPE_LAN || ct < CONNECTION_TYPE_MODEM)
+    {
+        ct = CONNECTION_TYPE_LAN;
+    }
+
     if ((xe->x264_enc_han == NULL) ||
             (xe->width != width) || (xe->height != height))
     {
@@ -128,20 +150,19 @@ xrdp_encoder_x264_encode(void *handle, int session, int left, int top,
         }
         if ((width > 0) && (height > 0))
         {
-            //x264_param_default_preset(&(xe->x264_params), "superfast", "zerolatency");
-            x264_param_default_preset(&(xe->x264_params), "ultrafast", "zerolatency");
+            x264_param_default_preset(&(xe->x264_params),
+                                      xg->x264_param[ct].preset,
+                                      xg->x264_param[ct].tune);
             xe->x264_params.i_threads = 1;
             xe->x264_params.i_width = (width + 15) & ~15;
             xe->x264_params.i_height = (height + 15) & ~15;
-            xe->x264_params.i_fps_num = 24;
-            xe->x264_params.i_fps_den = 1;
-            //xe->x264_params.b_cabac = 1;
-            //xe->x264_params.i_bframe = 0;
-            //xe->x264_params.rc.i_rc_method = X264_RC_CQP;
-            //xe->x264_params.rc.i_qp_constant = 23;
-            //x264_param_apply_profile(&(xe->x264_params), "high");
-            x264_param_apply_profile(&(xe->x264_params), "main");
-            //x264_param_apply_profile(&(xe->x264_params), "baseline");
+            xe->x264_params.i_fps_num = xg->x264_param[ct].fps_num;
+            xe->x264_params.i_fps_den = xg->x264_param[ct].fps_den;
+            xe->x264_params.rc.i_rc_method = X264_RC_CRF;
+            xe->x264_params.rc.i_vbv_max_bitrate = xg->x264_param[ct].vbv_max_bitrate;
+            xe->x264_params.rc.i_vbv_buffer_size = xg->x264_param[ct].vbv_buffer_size;
+            x264_param_apply_profile(&(xe->x264_params),
+                                     xg->x264_param[ct].profile);
             xe->x264_enc_han = x264_encoder_open(&(xe->x264_params));
             LOG(LOG_LEVEL_INFO, "xrdp_encoder_x264_encode: "
                 "x264_encoder_open rv %p for width %d height %d",

xrdp/xrdp_encoder_x264.h

@@ -32,7 +32,8 @@ xrdp_encoder_x264_encode(void *handle, int session, int left, int top,
                          int width, int height, int twidth, int theight,
                          int format, const char *data,
                          short *crects, int num_crects,
-                         char *cdata, int *cdata_bytes, int *flags_ptr);
+                         char *cdata, int *cdata_bytes, int connection_type,
+                         int *flags_ptr);
 
 #endif