X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fflags.cpp;h=402e33d7eca7a0be7d05d6ae87a4025f78ad9d0f;hb=ecaec75dd52d076ba53cafa1fed716ebc0d93da6;hp=887cd9603278ad478cac9a2babf3201bbb0b01cb;hpb=dcb238eb81768be4021f01dc7102c6c73821d0c0;p=nageru diff --git a/nageru/flags.cpp b/nageru/flags.cpp index 887cd96..402e33d 100644 --- a/nageru/flags.cpp +++ b/nageru/flags.cpp @@ -15,6 +15,7 @@ Flags global_flags; enum LongOption { OPTION_HELP = 1000, OPTION_FULLSCREEN, + OPTION_MAX_NUM_CARDS, OPTION_MULTICHANNEL, OPTION_MIDI_MAPPING, OPTION_DEFAULT_HDMI_INPUT, @@ -37,6 +38,8 @@ enum LongOption { OPTION_HTTP_AUDIO_CODEC, OPTION_HTTP_AUDIO_BITRATE, OPTION_HTTP_PORT, + OPTION_SRT_PORT, + OPTION_NO_SRT, OPTION_NO_TRANSCODE_AUDIO, OPTION_DISABLE_AUDIO, OPTION_FLAT_AUDIO, @@ -91,13 +94,13 @@ map parse_mjpeg_export_cards(char *optarg) fprintf(stderr, "ERROR: Invalid range %u-%u in --mjpeg-export-cards=\n", range_begin, range_end); exit(1); } - if (range_end >= unsigned(global_flags.num_cards)) { + if (range_end >= unsigned(global_flags.max_num_cards)) { // There are situations where we could possibly want to // include FFmpeg inputs (CEF inputs are unlikely), // but they're not necessarily in 4:2:2 Y'CbCr, so it would // require more functionality the the JPEG encoder. fprintf(stderr, "ERROR: Asked for (zero-indexed) card %u in --mjpeg-export-cards=, but there are only %u cards\n", - range_end, global_flags.num_cards); + range_end, global_flags.max_num_cards); exit(1); } for (unsigned card_idx = range_begin; card_idx <= range_end; ++card_idx) { @@ -131,7 +134,8 @@ void usage(Program program) fprintf(stderr, " -w, --width output width in pixels (default 1280)\n"); fprintf(stderr, " -h, --height output height in pixels (default 720)\n"); if (program == PROGRAM_NAGERU) { - fprintf(stderr, " -c, --num-cards set number of input cards (default 2)\n"); + fprintf(stderr, " -c, --num-cards set minimum number of input cards (default 2)\n"); + fprintf(stderr, " --max-num-cards set maximum number of input cards (default %d)\n", MAX_VIDEO_CARDS); fprintf(stderr, " -o, --output-card=CARD also output signal to the given card (default none)\n"); fprintf(stderr, " -t, --theme=FILE choose theme (default theme.lua)\n"); fprintf(stderr, " -I, --theme-dir=DIR search for theme in this directory (can be given multiple times)\n"); @@ -144,6 +148,7 @@ void usage(Program program) fprintf(stderr, " --midi-mapping=FILE start with the given MIDI controller mapping (implies --multichannel)\n"); fprintf(stderr, " --default-hdmi-input default to HDMI over SDI inputs for cards that have both\n"); fprintf(stderr, " --fake-cards-audio make fake (disconnected) cards output a simple tone\n"); + fprintf(stderr, " --v4l-output DEVICE send video (no audio) to V4L2 output/loopback\n"); fprintf(stderr, " --http-uncompressed-video send uncompressed NV12 video to HTTP clients\n"); fprintf(stderr, " --http-x264-video send x264-compressed video to HTTP clients\n"); fprintf(stderr, " --record-x264-video store x264-compressed video to disk (implies --http-x264-video,\n"); @@ -169,6 +174,9 @@ void usage(Program program) DEFAULT_AUDIO_OUTPUT_BIT_RATE / 1000); fprintf(stderr, " --http-port=PORT which port to use for the built-in HTTP server\n"); fprintf(stderr, " (default is %d)\n", DEFAULT_HTTPD_PORT); + fprintf(stderr, " --srt-port=PORT which port to use for receiving SRT streams\n"); + fprintf(stderr, " (default is %d)\n", DEFAULT_SRT_PORT); + fprintf(stderr, " --no-srt disable receiving SRT streams\n"); if (program == PROGRAM_KAERU) { fprintf(stderr, " --no-transcode-audio copy encoded audio raw from the source stream\n"); fprintf(stderr, " (requires --http-audio-codec= to be set)\n"); @@ -227,6 +235,7 @@ void parse_flags(Program program, int argc, char * const argv[]) { "width", required_argument, 0, 'w' }, { "height", required_argument, 0, 'h' }, { "num-cards", required_argument, 0, 'c' }, + { "max-num-cards", required_argument, 0, OPTION_MAX_NUM_CARDS }, { "output-card", required_argument, 0, 'o' }, { "theme", required_argument, 0, 't' }, { "theme-dir", required_argument, 0, 'I' }, @@ -255,6 +264,8 @@ void parse_flags(Program program, int argc, char * const argv[]) { "http-audio-codec", required_argument, 0, OPTION_HTTP_AUDIO_CODEC }, { "http-audio-bitrate", required_argument, 0, OPTION_HTTP_AUDIO_BITRATE }, { "http-port", required_argument, 0, OPTION_HTTP_PORT }, + { "srt-port", required_argument, 0, OPTION_SRT_PORT }, + { "no-srt", no_argument, 0, OPTION_NO_SRT }, { "no-transcode-audio", no_argument, 0, OPTION_NO_TRANSCODE_AUDIO }, { "disable-audio", no_argument, 0, OPTION_DISABLE_AUDIO }, { "flat-audio", no_argument, 0, OPTION_FLAT_AUDIO }, @@ -304,7 +315,10 @@ void parse_flags(Program program, int argc, char * const argv[]) global_flags.height = atoi(optarg); break; case 'c': - global_flags.num_cards = atoi(optarg); + global_flags.min_num_cards = atoi(optarg); + break; + case OPTION_MAX_NUM_CARDS: + global_flags.max_num_cards = atoi(optarg); break; case 'o': global_flags.output_card = atoi(optarg); @@ -372,6 +386,12 @@ void parse_flags(Program program, int argc, char * const argv[]) case OPTION_HTTP_PORT: global_flags.http_port = atoi(optarg); break; + case OPTION_SRT_PORT: + global_flags.srt_port = atoi(optarg); + break; + case OPTION_NO_SRT: + global_flags.srt_port = -1; + break; case OPTION_NO_TRANSCODE_AUDIO: global_flags.transcode_audio = false; break; @@ -573,12 +593,20 @@ void parse_flags(Program program, int argc, char * const argv[]) fprintf(stderr, "ERROR: --http-uncompressed-video and --http-x264-video are mutually incompatible\n"); exit(1); } - if (global_flags.num_cards <= 0) { + if (global_flags.min_num_cards <= 0) { fprintf(stderr, "ERROR: --num-cards must be at least 1\n"); exit(1); } + if (global_flags.max_num_cards <= 0) { + fprintf(stderr, "ERROR: --max-num-cards must be at least 1\n"); + exit(1); + } + if (global_flags.max_num_cards < global_flags.min_num_cards) { + fprintf(stderr, "ERROR: --max-num-cards can not be lower than --num-cards\n"); + exit(1); + } if (global_flags.output_card < -1 || - global_flags.output_card >= global_flags.num_cards) { + global_flags.output_card >= global_flags.max_num_cards) { fprintf(stderr, "ERROR: --output-card points to a nonexistant card\n"); exit(1); } @@ -610,8 +638,8 @@ void parse_flags(Program program, int argc, char * const argv[]) } for (pair mapping : global_flags.default_stream_mapping) { - if (mapping.second >= global_flags.num_cards) { - fprintf(stderr, "ERROR: Signal %d mapped to card %d, which doesn't exist (try adjusting --num-cards)\n", + if (mapping.second >= global_flags.max_num_cards) { + fprintf(stderr, "ERROR: Signal %d mapped to card %d, which doesn't exist (try adjusting --max-num-cards)\n", mapping.first, mapping.second); exit(1); } @@ -680,7 +708,7 @@ void parse_flags(Program program, int argc, char * const argv[]) if (!card_to_mjpeg_stream_export_set) { // Fill in the default mapping (export all cards, in order). - for (unsigned card_idx = 0; card_idx < unsigned(global_flags.num_cards); ++card_idx) { + for (unsigned card_idx = 0; card_idx < unsigned(global_flags.max_num_cards); ++card_idx) { global_flags.card_to_mjpeg_stream_export[card_idx] = card_idx; } }