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

Merge pull request #3221 from metalefty/x264-param

Browse Source 
tconfig: fix setting default value and refine logging
This commit is contained in:
metalefty 2024-08-25 01:23:53 +09:00 committed by GitHub
commit 5029bd12cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
xrdp/xrdp_tconfig.c
View File

@ -52,16 +52,18 @@ static int
tconfig_load_gfx_x264_ct(toml_table_t *tfile, const int connection_type, tconfig_load_gfx_x264_ct(toml_table_t *tfile, const int connection_type,
struct xrdp_tconfig_gfx_x264_param *param) struct xrdp_tconfig_gfx_x264_param *param)
{ {
TCLOG(LOG_LEVEL_TRACE, "[x264]");
if (connection_type > NUM_CONNECTION_TYPES) if (connection_type > NUM_CONNECTION_TYPES)
{ {
TCLOG(LOG_LEVEL_ERROR, "Invalid connection type is given"); TCLOG(LOG_LEVEL_ERROR, "[x264] Invalid connection type is given");
return 1; return 1;
} }
toml_table_t *x264 = toml_table_in(tfile, "x264"); toml_table_t *x264 = toml_table_in(tfile, "x264");
if (!x264) if (!x264)
{ {
TCLOG(LOG_LEVEL_WARNING, "x264 params are not defined"); TCLOG(LOG_LEVEL_WARNING, "[x264] x264 params are not defined");
return 1; return 1;
} }
@ -88,8 +90,8 @@ tconfig_load_gfx_x264_ct(toml_table_t *tfile, const int connection_type,
else if (connection_type == 0) else if (connection_type == 0)
{ {
TCLOG(LOG_LEVEL_WARNING, TCLOG(LOG_LEVEL_WARNING,
"x264 param preset is not set for connection type [%s], " "[x264.%s] preset is not set, adopting the default value \""
"adopting the default value \"" X264_DEFAULT_PRESET "\"", X264_DEFAULT_PRESET "\"",
rdpbcgr_connection_type_names[connection_type]); rdpbcgr_connection_type_names[connection_type]);
g_strncpy(param[connection_type].preset, g_strncpy(param[connection_type].preset,
X264_DEFAULT_PRESET, X264_DEFAULT_PRESET,
@ -108,8 +110,8 @@ tconfig_load_gfx_x264_ct(toml_table_t *tfile, const int connection_type,
else if (connection_type == 0) else if (connection_type == 0)
{ {
TCLOG(LOG_LEVEL_WARNING, TCLOG(LOG_LEVEL_WARNING,
"x264 param tune is not set for connection type [%s], " "[x264.%s] tune is not set, adopting the default value \""
"adopting the default value \"" X264_DEFAULT_TUNE "\"", X264_DEFAULT_TUNE"\"",
rdpbcgr_connection_type_names[connection_type]); rdpbcgr_connection_type_names[connection_type]);
g_strncpy(param[connection_type].tune, g_strncpy(param[connection_type].tune,
X264_DEFAULT_TUNE, X264_DEFAULT_TUNE,
@ -128,8 +130,8 @@ tconfig_load_gfx_x264_ct(toml_table_t *tfile, const int connection_type,
else if (connection_type == 0) else if (connection_type == 0)
{ {
TCLOG(LOG_LEVEL_WARNING, TCLOG(LOG_LEVEL_WARNING,
"x264 param profile is not set for connection type [%s], " "[x264.%s] profile is not set, adopting the default value \""
"adopting the default value \"" X264_DEFAULT_PROFILE "\"", X264_DEFAULT_PROFILE"\"",
rdpbcgr_connection_type_names[connection_type]); rdpbcgr_connection_type_names[connection_type]);
g_strncpy(param[connection_type].profile, g_strncpy(param[connection_type].profile,
X264_DEFAULT_PROFILE, X264_DEFAULT_PROFILE,
@ -145,8 +147,7 @@ tconfig_load_gfx_x264_ct(toml_table_t *tfile, const int connection_type,
else if (connection_type == 0) else if (connection_type == 0)
{ {
TCLOG(LOG_LEVEL_WARNING, TCLOG(LOG_LEVEL_WARNING,
"x264 param vbv_max_bit_rate is not set for connection type [%s], " "[x264.%s] vbv_max_bitrate is not set, adopting the default value [0]",
"adopting the default value [0]",
rdpbcgr_connection_type_names[connection_type]); rdpbcgr_connection_type_names[connection_type]);
param[connection_type].vbv_max_bitrate = 0; param[connection_type].vbv_max_bitrate = 0;
} }
@ -160,8 +161,7 @@ tconfig_load_gfx_x264_ct(toml_table_t *tfile, const int connection_type,
else if (connection_type == 0) else if (connection_type == 0)
{ {
TCLOG(LOG_LEVEL_WARNING, TCLOG(LOG_LEVEL_WARNING,
"x264 param vbv_buffer_size is not set for connection type [%s], " "[x264.%s] vbv_buffer_size is not set, adopting the default value [0]",
"adopting the default value [0]",
rdpbcgr_connection_type_names[connection_type]); rdpbcgr_connection_type_names[connection_type]);
param[connection_type].vbv_buffer_size = 0; param[connection_type].vbv_buffer_size = 0;
} }
@ -175,9 +175,9 @@ tconfig_load_gfx_x264_ct(toml_table_t *tfile, const int connection_type,
else if (connection_type == 0) else if (connection_type == 0)
{ {
TCLOG(LOG_LEVEL_WARNING, TCLOG(LOG_LEVEL_WARNING,
"x264 param fps_num is not set for connection type [%s], " "[x264.%s] fps_num is not set, adopting the default value [%d]",
"adopting the default value [0]", rdpbcgr_connection_type_names[connection_type],
rdpbcgr_connection_type_names[connection_type]); X264_DEFAULT_FPS_NUM);
param[connection_type].fps_num = X264_DEFAULT_FPS_NUM; param[connection_type].fps_num = X264_DEFAULT_FPS_NUM;
} }
@ -190,10 +190,10 @@ tconfig_load_gfx_x264_ct(toml_table_t *tfile, const int connection_type,
else if (connection_type == 0) else if (connection_type == 0)
{ {
TCLOG(LOG_LEVEL_WARNING, TCLOG(LOG_LEVEL_WARNING,
"x264 param fps_den is not set for connection type [%s], " "[x264.%s] fps_den is not set, adopting the default value [%d]",
"adopting the default value [0]", rdpbcgr_connection_type_names[connection_type],
rdpbcgr_connection_type_names[connection_type]); X264_DEFAULT_FPS_DEN);
param[connection_type].fps_num = X264_DEFAULT_FPS_DEN; param[connection_type].fps_den = X264_DEFAULT_FPS_DEN;
} }
return 0; return 0;