X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=flags.cpp;h=bdb9821d5aafed89dbe453be4865600f888beb68;hb=refs%2Fheads%2Fmjpeg;hp=2d8e37f5d8ff25944ce99e6942bfa2fe3aba0e60;hpb=6b1a2547dc1bb2202988f78cdbd4fd3807b760b5;p=nageru diff --git a/flags.cpp b/flags.cpp index 2d8e37f..bdb9821 100644 --- a/flags.cpp +++ b/flags.cpp @@ -14,8 +14,10 @@ Flags global_flags; // Long options that have no corresponding short option. enum LongOption { OPTION_HELP = 1000, + OPTION_FULLSCREEN, OPTION_MULTICHANNEL, OPTION_MIDI_MAPPING, + OPTION_DEFAULT_HDMI_INPUT, OPTION_FAKE_CARDS_AUDIO, OPTION_HTTP_UNCOMPRESSED_VIDEO, OPTION_HTTP_X264_VIDEO, @@ -61,8 +63,57 @@ enum LongOption { OPTION_10_BIT_INPUT, OPTION_10_BIT_OUTPUT, OPTION_INPUT_YCBCR_INTERPRETATION, + OPTION_MJPEG_EXPORT_CARDS, }; +map parse_mjpeg_export_cards(char *optarg) +{ + map ret; + if (optarg[0] == '\0') { + return ret; + } + + unsigned stream_idx = 0; + char *start = optarg; + for ( ;; ) { + char *end = strchr(start, ','); + if (end != nullptr) { + *end = '\0'; + } + + unsigned range_begin, range_end; + if (sscanf(start, "%u-%u", &range_begin, &range_end) != 2) { + range_begin = range_end = atoi(start); + } + if (range_end < range_begin) { + 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)) { + // 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); + exit(1); + } + for (unsigned card_idx = range_begin; card_idx <= range_end; ++card_idx) { + if (ret.count(card_idx)) { + fprintf(stderr, "ERROR: Card %u was given twice in --mjpeg-export-cards=\n", card_idx); + exit(1); + } + ret[card_idx] = stream_idx++; + } + if (end == nullptr) { + break; + } else { + start = end + 1; + } + } + return ret; +} + void usage(Program program) { if (program == PROGRAM_KAERU) { @@ -72,6 +123,9 @@ void usage(Program program) } fprintf(stderr, "\n"); fprintf(stderr, " --help print usage information\n"); + if (program == PROGRAM_NAGERU) { + fprintf(stderr, " --fullscreen run in full screen, with no decorations\n"); + } 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) { @@ -86,6 +140,7 @@ void usage(Program program) fprintf(stderr, " -M, --input-mapping=FILE start with the given audio input mapping (implies --multichannel)\n"); fprintf(stderr, " --multichannel start in multichannel audio mapping mode\n"); 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, " --http-uncompressed-video send uncompressed NV12 video to HTTP clients\n"); fprintf(stderr, " --http-x264-video send x264-compressed video to HTTP clients\n"); @@ -116,8 +171,6 @@ void usage(Program program) fprintf(stderr, " --no-transcode-audio copy encoded audio raw from the source stream\n"); fprintf(stderr, " (requires --http-audio-codec= to be set)\n"); } - fprintf(stderr, " --http-coarse-timebase use less timebase for HTTP (recommended for muxers\n"); - fprintf(stderr, " that handle large pts poorly, like e.g. MP4)\n"); if (program == PROGRAM_NAGERU) { fprintf(stderr, " --flat-audio start with most audio processing turned off\n"); fprintf(stderr, " (can be overridden by e.g. --enable-limiter)\n"); @@ -156,6 +209,10 @@ void usage(Program program) fprintf(stderr, " Y'CbCr coefficient standard of card CARD (default auto)\n"); fprintf(stderr, " auto is rec601 for SD, rec709 for HD, always limited\n"); fprintf(stderr, " limited means standard 0-240/0-235 input range (for 8-bit)\n"); + fprintf(stderr, " --mjpeg-export-cards=RANGE[,RANGE...]\n"); + fprintf(stderr, " export the given cards in MJPEG format to /multicam.mp4,\n"); + fprintf(stderr, " in the given order (ranges can be either single card indexes\n"); + fprintf(stderr, " or pairs like 1-3 for camera 1,2,3; default is all cards)\n"); } } @@ -163,6 +220,7 @@ void parse_flags(Program program, int argc, char * const argv[]) { static const option long_options[] = { { "help", no_argument, 0, OPTION_HELP }, + { "fullscreen", no_argument, 0, OPTION_FULLSCREEN }, { "width", required_argument, 0, 'w' }, { "height", required_argument, 0, 'h' }, { "num-cards", required_argument, 0, 'c' }, @@ -175,6 +233,7 @@ void parse_flags(Program program, int argc, char * const argv[]) { "va-display", required_argument, 0, 'v' }, { "multichannel", no_argument, 0, OPTION_MULTICHANNEL }, { "midi-mapping", required_argument, 0, OPTION_MIDI_MAPPING }, + { "default-hdmi-input", no_argument, 0, OPTION_DEFAULT_HDMI_INPUT }, { "fake-cards-audio", no_argument, 0, OPTION_FAKE_CARDS_AUDIO }, { "http-uncompressed-video", no_argument, 0, OPTION_HTTP_UNCOMPRESSED_VIDEO }, { "http-x264-video", no_argument, 0, OPTION_HTTP_X264_VIDEO }, @@ -189,7 +248,6 @@ void parse_flags(Program program, int argc, char * const argv[]) { "x264-vbv-max-bitrate", required_argument, 0, OPTION_X264_VBV_MAX_BITRATE }, { "x264-param", required_argument, 0, OPTION_X264_PARAM }, { "http-mux", required_argument, 0, OPTION_HTTP_MUX }, - { "http-coarse-timebase", no_argument, 0, OPTION_HTTP_COARSE_TIMEBASE }, { "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 }, @@ -220,10 +278,12 @@ void parse_flags(Program program, int argc, char * const argv[]) { "10-bit-input", no_argument, 0, OPTION_10_BIT_INPUT }, { "10-bit-output", no_argument, 0, OPTION_10_BIT_OUTPUT }, { "input-ycbcr-interpretation", required_argument, 0, OPTION_INPUT_YCBCR_INTERPRETATION }, + { "mjpeg-export-cards", required_argument, 0, OPTION_MJPEG_EXPORT_CARDS }, { 0, 0, 0, 0 } }; vector theme_dirs; string output_ycbcr_coefficients = "auto"; + bool card_to_mjpeg_stream_export_set = false; for ( ;; ) { int option_index = 0; int c = getopt_long(argc, argv, "c:t:I:r:v:m:M:w:h:", long_options, &option_index); @@ -283,6 +343,9 @@ void parse_flags(Program program, int argc, char * const argv[]) global_flags.midi_mapping_filename = optarg; global_flags.multichannel_mapping_mode = true; break; + case OPTION_DEFAULT_HDMI_INPUT: + global_flags.default_hdmi_input = true; + break; case OPTION_FAKE_CARDS_AUDIO: global_flags.fake_cards_audio = true; break; @@ -292,9 +355,6 @@ void parse_flags(Program program, int argc, char * const argv[]) case OPTION_HTTP_MUX: global_flags.stream_mux_name = optarg; break; - case OPTION_HTTP_COARSE_TIMEBASE: - global_flags.stream_coarse_timebase = true; - break; case OPTION_HTTP_AUDIO_CODEC: global_flags.stream_audio_codec_name = optarg; break; @@ -473,6 +533,18 @@ void parse_flags(Program program, int argc, char * const argv[]) global_flags.ycbcr_interpretation[card_num] = interpretation; break; } + case OPTION_FULLSCREEN: + global_flags.fullscreen = true; + break; + case OPTION_MJPEG_EXPORT_CARDS: { + if (card_to_mjpeg_stream_export_set) { + fprintf(stderr, "ERROR: --mjpeg-export-cards given twice\n"); + exit(1); + } + global_flags.card_to_mjpeg_stream_export = parse_mjpeg_export_cards(optarg); + card_to_mjpeg_stream_export_set = true; + break; + } case OPTION_HELP: usage(program); exit(0); @@ -593,4 +665,11 @@ void parse_flags(Program program, int argc, char * const argv[]) } else if (global_flags.x264_bitrate == -1) { global_flags.x264_bitrate = DEFAULT_X264_OUTPUT_BIT_RATE; } + + 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) { + global_flags.card_to_mjpeg_stream_export[card_idx] = card_idx; + } + } }