From 1441e78b70b1cc2101c5fca24efc7278ce8f8995 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Sun, 15 Mar 2020 10:33:34 +0100 Subject: [PATCH 1/2] Fixed gfx-h264 option parsing. --- client/common/cmdline.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/client/common/cmdline.c b/client/common/cmdline.c index e732e21b2..f646e93fe 100644 --- a/client/common/cmdline.c +++ b/client/common/cmdline.c @@ -2547,10 +2547,14 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings, if (_strnicmp("AVC444", val, 7) == 0) { + settings->GfxH264 = TRUE; settings->GfxAVC444 = TRUE; } - else if (_strnicmp("AVC420", val, 7) != 0) - rc = COMMAND_LINE_ERROR; + else if (_strnicmp("AVC420", val, 7) == 0) + { + settings->GfxH264 = TRUE; + settings->GfxAVC444 = FALSE; + } else if (_strnicmp("mask:", val, 5) == 0) { ULONGLONG v; @@ -2560,6 +2564,8 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings, else settings->GfxCapsFilter = (UINT32)v; } + else + rc = COMMAND_LINE_ERROR; } } free(p); From efb588db04a8fd8503a9c68ba96187eef94ad917 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Sun, 15 Mar 2020 10:33:53 +0100 Subject: [PATCH 2/2] Added deprecation warning to gfx-h264 --- client/common/cmdline.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/common/cmdline.h b/client/common/cmdline.h index 16e79371e..fbde3af73 100644 --- a/client/common/cmdline.h +++ b/client/common/cmdline.h @@ -159,8 +159,9 @@ static const COMMAND_LINE_ARGUMENT_A args[] = { #ifdef WITH_GFX_H264 { "gfx", COMMAND_LINE_VALUE_OPTIONAL, "[[RFX|AVC420|AVC444],mask:]", NULL, NULL, -1, NULL, "RDP8 graphics pipeline" }, - { "gfx-h264", COMMAND_LINE_VALUE_OPTIONAL, "[[AVC420|AVC444],mask:]", NULL, NULL, -1, - NULL, "RDP8.1 graphics pipeline using H264 codec" }, + { "gfx-h264", COMMAND_LINE_VALUE_OPTIONAL, + "[[AVC420|AVC444],mask:] [DEPRECATED] use /gfx:avc420 instead", NULL, NULL, -1, NULL, + "RDP8.1 graphics pipeline using H264 codec" }, #else { "gfx", COMMAND_LINE_VALUE_OPTIONAL, "RFX", NULL, NULL, -1, NULL, "RDP8 graphics pipeline" }, #endif