main: Prioritise open-h264 encoding

pull/6/head
Andri Yngvason 2022-04-10 16:56:59 +00:00
parent 72c497e61d
commit 7e89a36f43
1 changed files with 13 additions and 3 deletions

View File

@ -681,7 +681,7 @@ Usage: wlvncc <address> [port]\n\
-c,--compression Compression level (0 - 9).\n\ -c,--compression Compression level (0 - 9).\n\
-e,--encodings=<list> Set allowed encodings, comma separated list.\n\ -e,--encodings=<list> Set allowed encodings, comma separated list.\n\
Supported values: tight, zrle, ultra, copyrect,\n\ Supported values: tight, zrle, ultra, copyrect,\n\
hextile, zlib, corre, rre, raw.\n\ hextile, zlib, corre, rre, raw, open-h264.\n\
-h,--help Get help.\n\ -h,--help Get help.\n\
-n,--hide-cursor Hide the client-side cursor.\n\ -n,--hide-cursor Hide the client-side cursor.\n\
-q,--quality Quality level (0 - 9).\n\ -q,--quality Quality level (0 - 9).\n\
@ -817,8 +817,18 @@ int main(int argc, char* argv[])
goto vnc_setup_failure; goto vnc_setup_failure;
} }
if (encodings) if (encodings) {
vnc_client_set_encodings(vnc, encodings); if (!have_egl && strstr(encodings, "open-h264")) {
fprintf(stderr, "Open H.264 encoding won't work without EGL\n");
goto vnc_setup_failure;
}
} else if (have_egl) {
encodings = "open-h264,tight,zrle,ultra,copyrect,hextile,zlib"
",corre,rre,raw";
} else {
encodings = "tight,zrle,ultra,copyrect,hextile,zlib,corre,rre,raw";
}
vnc_client_set_encodings(vnc, encodings);
if (quality >= 0) if (quality >= 0)
vnc_client_set_quality_level(vnc, quality); vnc_client_set_quality_level(vnc, quality);