X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=flags.cpp;h=9b3a9dac7f302de31f315154f85f0236b301545b;hb=6ffaabac0a523617b686f40c154a25cb548cc561;hp=773750d961afb5ec735939345c9d8e0f382e9740;hpb=ad1641ad3ab50ecd17af2e1c2d980f26e6adf0bb;p=nageru diff --git a/flags.cpp b/flags.cpp index 773750d..9b3a9da 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, @@ -33,6 +35,8 @@ enum LongOption { OPTION_HTTP_COARSE_TIMEBASE, OPTION_HTTP_AUDIO_CODEC, OPTION_HTTP_AUDIO_BITRATE, + OPTION_HTTP_PORT, + OPTION_NO_TRANSCODE_AUDIO, OPTION_FLAT_AUDIO, OPTION_GAIN_STAGING, OPTION_DISABLE_LOCUT, @@ -55,6 +59,7 @@ enum LongOption { OPTION_OUTPUT_SLOP_FRAMES, OPTION_TIMECODE_STREAM, OPTION_TIMECODE_STDOUT, + OPTION_QUICK_CUT_KEYS, OPTION_10_BIT_INPUT, OPTION_10_BIT_OUTPUT, OPTION_INPUT_YCBCR_INTERPRETATION, @@ -69,6 +74,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) { @@ -83,6 +91,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"); @@ -107,8 +116,12 @@ void usage(Program program) fprintf(stderr, " --http-audio-bitrate=KBITS audio codec bit rate to use for HTTP streams\n"); fprintf(stderr, " (default is %d, ignored unless --http-audio-codec is set)\n", DEFAULT_AUDIO_OUTPUT_BIT_RATE / 1000); - 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"); + 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); + 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"); + } 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"); @@ -139,6 +152,7 @@ void usage(Program program) fprintf(stderr, " dropping the frame (default 0.5)\n"); fprintf(stderr, " --timecode-stream show timestamp and timecode in stream\n"); fprintf(stderr, " --timecode-stdout show timestamp and timecode on standard output\n"); + fprintf(stderr, " --quick-cut-keys enable direct cutting by Q, W, E, ... keys\n"); fprintf(stderr, " --10-bit-input use 10-bit video input (requires compute shaders)\n"); fprintf(stderr, " --10-bit-output use 10-bit video output (requires compute shaders,\n"); fprintf(stderr, " implies --record-x264-video)\n"); @@ -153,6 +167,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' }, @@ -165,6 +180,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 }, @@ -179,9 +195,10 @@ 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 }, + { "no-transcode-audio", no_argument, 0, OPTION_NO_TRANSCODE_AUDIO }, { "flat-audio", no_argument, 0, OPTION_FLAT_AUDIO }, { "gain-staging", required_argument, 0, OPTION_GAIN_STAGING }, { "disable-locut", no_argument, 0, OPTION_DISABLE_LOCUT }, @@ -204,6 +221,7 @@ void parse_flags(Program program, int argc, char * const argv[]) { "output-slop-frames", required_argument, 0, OPTION_OUTPUT_SLOP_FRAMES }, { "timecode-stream", no_argument, 0, OPTION_TIMECODE_STREAM }, { "timecode-stdout", no_argument, 0, OPTION_TIMECODE_STDOUT }, + { "quick-cut-keys", no_argument, 0, OPTION_QUICK_CUT_KEYS }, { "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 }, @@ -270,6 +288,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; @@ -279,15 +300,18 @@ 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; case OPTION_HTTP_AUDIO_BITRATE: global_flags.stream_audio_codec_bitrate = atoi(optarg) * 1000; break; + case OPTION_HTTP_PORT: + global_flags.http_port = atoi(optarg); + break; + case OPTION_NO_TRANSCODE_AUDIO: + global_flags.transcode_audio = false; + break; case OPTION_HTTP_X264_VIDEO: global_flags.x264_video_to_http = true; break; @@ -394,6 +418,9 @@ void parse_flags(Program program, int argc, char * const argv[]) case OPTION_TIMECODE_STDOUT: global_flags.display_timecode_on_stdout = true; break; + case OPTION_QUICK_CUT_KEYS: + global_flags.enable_quick_cut_keys = true; + break; case OPTION_10_BIT_INPUT: global_flags.ten_bit_input = true; break; @@ -451,6 +478,9 @@ 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_HELP: usage(program); exit(0); @@ -476,6 +506,11 @@ void parse_flags(Program program, int argc, char * const argv[]) fprintf(stderr, "ERROR: --output-card points to a nonexistant card\n"); exit(1); } + if (!global_flags.transcode_audio && global_flags.stream_audio_codec_name.empty()) { + fprintf(stderr, "ERROR: If not transcoding audio, you must specify ahead-of-time what audio codec is in use\n"); + fprintf(stderr, " (using --http-audio-codec).\n"); + exit(1); + } if (global_flags.x264_speedcontrol) { if (!global_flags.x264_preset.empty() && global_flags.x264_preset != "faster") { fprintf(stderr, "WARNING: --x264-preset is overridden by --x264-speedcontrol (implicitly uses \"faster\" as base preset)\n");