From 7d94e167c428147b92ac126ffd1dd46ab1694ec3 Mon Sep 17 00:00:00 2001 From: fduncanh Date: Thu, 24 Feb 2022 18:09:54 -0500 Subject: [PATCH] edited -v and manpage help options --- uxplay.1 | 12 +++++++----- uxplay.cpp | 6 ++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/uxplay.1 b/uxplay.1 index 3a160fe..14e4fc4 100644 --- a/uxplay.1 +++ b/uxplay.1 @@ -39,22 +39,24 @@ UxPlay 1.48: An open\-source AirPlay mirroring server based on RPiPlay .TP \fB\-vd\fI dec \fR Choose GStreamer h264 decoder; default "decodebin" .IP - some choices: avdec_h264,vaapih264dec,nvdec,nvh264dec,v4l2h264dec. + choices: (software) avdec_h264; (hardware) v4l2h264dec, +.IP + nvdec, nvh264dec, vaapih264dec, vtdec, etc. .TP \fB\-vc\fI cnv \fR Choose GStreamer videoconverter; default "videoconvert" .IP - another choice when using v4l2h264dec: v4l2decode. + another choice when using v4l2h264dec: v4l2convert. .TP \fB\-vs\fI sink\fR Choose the GStreamer videosink; default "autovideosink" .IP - some choices: ximagesink,xvimagesink,vaapisink,glimagesink, + choices: ximagesink,xvimagesink,vaapisink,glimagesink, .IP gtksink,waylandsink,osximagesink,fpsdisplaysink, etc. .PP .TP \fB\-vs\fR 0 Streamed audio only, with no video display window. .TP -\fB\-avdec\fR Force software h264 video decoding with libav h264 decoder. +\fB\-avdec\fR Force software h264 video decoding with libav decoder. .TP \fB\-as\fI sink\fR Choose the GStreamer audiosink; default "autoaudiosink" .IP @@ -63,7 +65,7 @@ UxPlay 1.48: An open\-source AirPlay mirroring server based on RPiPlay .TP \fB\-as\fR 0 (or \fB\-a\fR) Turn audio off, streamed video only. .TP -\fB\-reset\fR n Reset after 3n seconds client silence (default 10, 0 = never). +\fB\-reset\fR n Reset after 3n seconds client silence (default 10, 0=never). .TP \fB\-nc\fR Do not close video window when client stops mirroring .TP diff --git a/uxplay.cpp b/uxplay.cpp index cb0ee01..489b476 100644 --- a/uxplay.cpp +++ b/uxplay.cpp @@ -227,6 +227,8 @@ static void print_info (char *name) { printf("-m Use random MAC address (use for concurrent UxPlay's)\n"); printf("-t n Relaunch server if no connection existed in last n seconds\n"); printf("-vd ... Choose the GStreamer h264 decoder; default \"decodebin\"\n"); + printf(" choices: (software) avdec_h264; (hardware) v4l2h264dec,\n"); + printf(" nvdec, nvh264dec, vaapih64dec, vtdec,etc.\n"); printf(" choices: avdec_h264,vaapih264dec,nvdec,nvh264dec,v4l2h264dec\n"); printf("-vc ... Choose the GStreamer videoconverter; default \"videoconvert\"\n"); printf(" another choice when using v4l2h264decode: v4l2convert\n"); @@ -234,11 +236,11 @@ static void print_info (char *name) { printf(" some choices: ximagesink,xvimagesink,vaapisink,glimagesink,\n"); printf(" gtksink,waylandsink,osximagesink,fpsdisplaysink, etc.\n"); printf("-vs 0 Streamed audio only, with no video display window\n"); - printf("-avdec Force software h264 video decoding with libav h264 decoder\n"); + printf("-avdec Force software h264 video decoding with libav decoder\n"); printf("-as ... Choose the GStreamer audiosink; default \"autoaudiosink\"\n"); printf(" choices: pulsesink,alsasink,osssink,oss4sink,osxaudiosink\n"); printf("-as 0 (or -a) Turn audio off, streamed video only\n"); - printf("-reset n Reset after 3n seconds client silence (default %d, 0 = never)\n", NTP_TIMEOUT_LIMIT); + printf("-reset n Reset after 3n seconds client silence (default %d, 0=never)\n", NTP_TIMEOUT_LIMIT); printf("-nc do Not Close video window when client stops mirroring\n"); printf("-FPSdata Show video-streaming performance reports sent by client.\n"); printf("-d Enable debug logging\n");