tconfig: review fixes

- Use H.264 (with a dot) in config
- Take care of odd case
- Fix an incorrect comment

tests/xrdp/Makefile.am

@@ -26,6 +26,7 @@ EXTRA_DIST = \
   gfx/gfx_codec_h264_preferred.toml \
   gfx/gfx_codec_h264_only.toml \
   gfx/gfx_codec_rfx_preferred.toml \
+  gfx/gfx_codec_rfx_preferred_odd.toml \
   gfx/gfx_codec_rfx_only.toml
 
 TESTS = test_xrdp

tests/xrdp/gfx/gfx.toml

@@ -1,5 +1,5 @@
 [codec]
-order = [ "H264", "RFX" ]
+order = [ "H.264", "RFX" ]
 
 [x264.default]
 preset = "ultrafast"

tests/xrdp/gfx/gfx_codec_h264_only.toml

@@ -1,5 +1,5 @@
 [codec]
-order = [ "H264" ]
+order = [ "H.264" ]
 
 [x264.default]
 preset = "ultrafast"

tests/xrdp/gfx/gfx_codec_h264_preferred.toml

@@ -1,5 +1,5 @@
 [codec]
-order = [ "H264", "RFX" ]
+order = [ "H.264", "RFX" ]
 
 [x264.default]
 preset = "ultrafast"

tests/xrdp/gfx/gfx_codec_rfx_preferred.toml

@@ -1,5 +1,5 @@
 [codec]
-order = [ "RFX", "H264" ]
+order = [ "RFX", "H.264" ]
 
 [x264.default]
 preset = "ultrafast"

tests/xrdp/gfx/gfx_codec_rfx_preferred_odd.toml

@@ -0,0 +1,18 @@
+[codec]
+order = [ "RFX", "H.264", "RFX" ]
+
+[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]
+[x264.wan]
+[x264.broadband_high]
+[x264.satellite]
+[x264.broadband_low]
+[x264.modem]

tests/xrdp/test_tconfig.c

@@ -54,12 +54,18 @@ START_TEST(test_tconfig_gfx_codec_order)
     ck_assert_int_gt(gfxconfig.codec.rfx_idx, -1);
     ck_assert_int_lt(gfxconfig.codec.rfx_idx, gfxconfig.codec.h264_idx);
 
+    /* RFX appears twice like: RFX, H264, RFX */
+    tconfig_load_gfx(GFXCONF_STUBDIR "/gfx_codec_rfx_preferred_odd.toml", &gfxconfig);
+    ck_assert_int_gt(gfxconfig.codec.h264_idx, -1);
+    ck_assert_int_gt(gfxconfig.codec.rfx_idx, -1);
+    ck_assert_int_lt(gfxconfig.codec.rfx_idx, gfxconfig.codec.h264_idx);
+
     /* RFX only */
     tconfig_load_gfx(GFXCONF_STUBDIR "/gfx_codec_rfx_only.toml", &gfxconfig);
     ck_assert_int_eq(gfxconfig.codec.h264_idx, -1);
     ck_assert_int_gt(gfxconfig.codec.rfx_idx, -1);
 
-    /* RFX is preferred if order undefined */
+    /* H264 is preferred if order undefined */
     tconfig_load_gfx(GFXCONF_STUBDIR "/gfx_codec_order_undefined.toml", &gfxconfig);
     ck_assert_int_gt(gfxconfig.codec.h264_idx, -1);
     ck_assert_int_gt(gfxconfig.codec.rfx_idx, -1);

xrdp/xrdp_tconfig.c

@@ -225,13 +225,15 @@ static int tconfig_load_gfx_order(toml_table_t *tfile, struct xrdp_tconfig_gfx *
 
             if (datum.ok)
             {
-                if (g_strcasecmp(datum.u.s, "h264") == 0 ||
-                        g_strcasecmp(datum.u.s, "h.264") == 0)
+                if (h264_found == 0 &&
+                       (g_strcasecmp(datum.u.s, "h264") == 0 ||
+                        g_strcasecmp(datum.u.s, "h.264") == 0))
                 {
                     h264_found = 1;
                     config->codec.h264_idx = i;
                 }
-                if (g_strcasecmp(datum.u.s, "rfx") == 0)
+                if (rfx_found == 0 &&
+                        g_strcasecmp(datum.u.s, "rfx") == 0)
                 {
                     rfx_found = 1;
                     config->codec.rfx_idx = i;