X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=flags.cpp;h=e6c306be52d23b38614aa8361aac6331404c5cca;hb=0556d8cb8416bdc7b432a432c3d58239a94358d2;hp=1983c75e3d6f7b232ed95b3c9b937ca1841e61db;hpb=605ebde8d784157641733f8eddf31012227888ce;p=nageru diff --git a/flags.cpp b/flags.cpp index 1983c75..e6c306b 100644 --- a/flags.cpp +++ b/flags.cpp @@ -19,6 +19,7 @@ enum LongOption { OPTION_FAKE_CARDS_AUDIO, OPTION_HTTP_UNCOMPRESSED_VIDEO, OPTION_HTTP_X264_VIDEO, + OPTION_RECORD_X264_VIDEO, OPTION_X264_PRESET, OPTION_X264_TUNE, OPTION_X264_SPEEDCONTROL, @@ -26,6 +27,7 @@ enum LongOption { OPTION_X264_BITRATE, OPTION_X264_VBV_BUFSIZE, OPTION_X264_VBV_MAX_BITRATE, + OPTION_X264_10_BIT, OPTION_X264_PARAM, OPTION_HTTP_MUX, OPTION_HTTP_COARSE_TIMEBASE, @@ -46,7 +48,14 @@ enum LongOption { OPTION_DISABLE_ALSA_OUTPUT, OPTION_NO_FLUSH_PBOS, OPTION_PRINT_VIDEO_LATENCY, - OPTION_AUDIO_QUEUE_LENGTH_MS + OPTION_MAX_INPUT_QUEUE_FRAMES, + OPTION_AUDIO_QUEUE_LENGTH_MS, + OPTION_OUTPUT_YCBCR_COEFFICIENTS, + OPTION_OUTPUT_BUFFER_FRAMES, + OPTION_OUTPUT_SLOP_FRAMES, + OPTION_TIMECODE_STREAM, + OPTION_TIMECODE_STDOUT, + OPTION_10_BIT_INPUT, }; void usage() @@ -57,6 +66,7 @@ void usage() fprintf(stderr, " -w, --width output width in pixels (default 1280)\n"); fprintf(stderr, " -h, --height output height in pixels (default 720)\n"); fprintf(stderr, " -c, --num-cards set number of input cards (default 2)\n"); + 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"); fprintf(stderr, " -v, --va-display=SPEC VA-API device for H.264 encoding\n"); @@ -68,6 +78,8 @@ void usage() 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"); + fprintf(stderr, " --record-x264-video store x264-compressed video to disk (implies --http-x264-video,\n"); + fprintf(stderr, " removes the need for working VA-API encoding)\n"); fprintf(stderr, " --x264-preset x264 quality preset (default " X264_DEFAULT_PRESET ")\n"); fprintf(stderr, " --x264-tune x264 tuning (default " X264_DEFAULT_TUNE ", can be blank)\n"); fprintf(stderr, " --x264-speedcontrol try to match x264 preset to available CPU speed\n"); @@ -78,6 +90,7 @@ void usage() fprintf(stderr, " default: same as --x264-bitrate, that is, one-second VBV)\n"); fprintf(stderr, " --x264-vbv-max-bitrate x264 local max bitrate (in kilobit/sec per --vbv-bufsize,\n"); fprintf(stderr, " 0 = no limit, default: same as --x264-bitrate, i.e., CBR)\n"); + fprintf(stderr, " --x264-10-bit enable 10-bit x264 encoding\n"); fprintf(stderr, " --x264-param=NAME[,VALUE] set any x264 parameter, for fine tuning\n"); fprintf(stderr, " --http-mux=NAME mux to use for HTTP streams (default " DEFAULT_STREAM_MUX_NAME ")\n"); fprintf(stderr, " --http-audio-codec=NAME audio codec to use for HTTP streams\n"); @@ -101,7 +114,22 @@ void usage() fprintf(stderr, " (will give display corruption, but makes it\n"); fprintf(stderr, " possible to run with apitrace in real time)\n"); fprintf(stderr, " --print-video-latency print out measurements of video latency on stdout\n"); - fprintf(stderr, " --audio-queue-length-ms length of audio resampling queue (default 100.0)\n"); + fprintf(stderr, " --max-input-queue-frames=FRAMES never keep more than FRAMES frames for each card\n"); + fprintf(stderr, " (default 6, minimum 1)\n"); + fprintf(stderr, " --audio-queue-length-ms=MS length of audio resampling queue (default 100.0)\n"); + fprintf(stderr, " --output-ycbcr-coefficients={rec601,rec709,auto}\n"); + fprintf(stderr, " Y'CbCr coefficient standard of output (default auto)\n"); + fprintf(stderr, " auto is rec601, unless --output-card is used\n"); + fprintf(stderr, " and a Rec. 709 mode (typically HD modes) is in use\n"); + fprintf(stderr, " --output-buffer-frames=NUM number of frames in output buffer for --output-card,\n"); + fprintf(stderr, " can be fractional (default 6.0); note also\n"); + fprintf(stderr, " the audio queue can't be much longer than this\n"); + fprintf(stderr, " --output-slop-frames=NUM if more less than this number of frames behind for\n"); + fprintf(stderr, " --output-card, try to submit anyway instead of\n"); + 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, " --10-bit-input use 10-bit video input (requires compute shaders)\n"); } void parse_flags(int argc, char * const argv[]) @@ -111,6 +139,7 @@ void parse_flags(int argc, char * const argv[]) { "width", required_argument, 0, 'w' }, { "height", required_argument, 0, 'h' }, { "num-cards", required_argument, 0, 'c' }, + { "output-card", required_argument, 0, 'o' }, { "theme", required_argument, 0, 't' }, { "theme-dir", required_argument, 0, 'I' }, { "map-signal", required_argument, 0, 'm' }, @@ -121,6 +150,7 @@ void parse_flags(int argc, char * const argv[]) { "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 }, + { "record-x264-video", no_argument, 0, OPTION_RECORD_X264_VIDEO }, { "x264-preset", required_argument, 0, OPTION_X264_PRESET }, { "x264-tune", required_argument, 0, OPTION_X264_TUNE }, { "x264-speedcontrol", no_argument, 0, OPTION_X264_SPEEDCONTROL }, @@ -128,6 +158,7 @@ void parse_flags(int argc, char * const argv[]) { "x264-bitrate", required_argument, 0, OPTION_X264_BITRATE }, { "x264-vbv-bufsize", required_argument, 0, OPTION_X264_VBV_BUFSIZE }, { "x264-vbv-max-bitrate", required_argument, 0, OPTION_X264_VBV_MAX_BITRATE }, + { "x264-10-bit", no_argument, 0, OPTION_X264_10_BIT }, { "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 }, @@ -148,10 +179,18 @@ void parse_flags(int argc, char * const argv[]) { "disable-alsa-output", no_argument, 0, OPTION_DISABLE_ALSA_OUTPUT }, { "no-flush-pbos", no_argument, 0, OPTION_NO_FLUSH_PBOS }, { "print-video-latency", no_argument, 0, OPTION_PRINT_VIDEO_LATENCY }, + { "max-input-queue-frames", required_argument, 0, OPTION_MAX_INPUT_QUEUE_FRAMES }, { "audio-queue-length-ms", required_argument, 0, OPTION_AUDIO_QUEUE_LENGTH_MS }, + { "output-ycbcr-coefficients", required_argument, 0, OPTION_OUTPUT_YCBCR_COEFFICIENTS }, + { "output-buffer-frames", required_argument, 0, OPTION_OUTPUT_BUFFER_FRAMES }, + { "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 }, + { "10-bit-input", no_argument, 0, OPTION_10_BIT_INPUT }, { 0, 0, 0, 0 } }; vector theme_dirs; + string output_ycbcr_coefficients = "auto"; for ( ;; ) { int option_index = 0; int c = getopt_long(argc, argv, "c:t:I:v:m:M:w:h:", long_options, &option_index); @@ -169,6 +208,9 @@ void parse_flags(int argc, char * const argv[]) case 'c': global_flags.num_cards = atoi(optarg); break; + case 'o': + global_flags.output_card = atoi(optarg); + break; case 't': global_flags.theme_filename = optarg; break; @@ -226,6 +268,10 @@ void parse_flags(int argc, char * const argv[]) case OPTION_HTTP_X264_VIDEO: global_flags.x264_video_to_http = true; break; + case OPTION_RECORD_X264_VIDEO: + global_flags.x264_video_to_disk = true; + global_flags.x264_video_to_http = true; + break; case OPTION_X264_PRESET: global_flags.x264_preset = optarg; break; @@ -244,6 +290,9 @@ void parse_flags(int argc, char * const argv[]) case OPTION_X264_VBV_BUFSIZE: global_flags.x264_vbv_buffer_size = atoi(optarg); break; + case OPTION_X264_10_BIT: + global_flags.x264_bit_depth = 10; + break; case OPTION_X264_VBV_MAX_BITRATE: global_flags.x264_vbv_max_bitrate = atoi(optarg); break; @@ -301,9 +350,30 @@ void parse_flags(int argc, char * const argv[]) case OPTION_PRINT_VIDEO_LATENCY: global_flags.print_video_latency = true; break; + case OPTION_MAX_INPUT_QUEUE_FRAMES: + global_flags.max_input_queue_frames = atoi(optarg); + break; case OPTION_AUDIO_QUEUE_LENGTH_MS: global_flags.audio_queue_length_ms = atof(optarg); break; + case OPTION_OUTPUT_YCBCR_COEFFICIENTS: + output_ycbcr_coefficients = optarg; + break; + case OPTION_OUTPUT_BUFFER_FRAMES: + global_flags.output_buffer_frames = atof(optarg); + break; + case OPTION_OUTPUT_SLOP_FRAMES: + global_flags.output_slop_frames = atof(optarg); + break; + case OPTION_TIMECODE_STREAM: + global_flags.display_timecode_in_stream = true; + break; + case OPTION_TIMECODE_STDOUT: + global_flags.display_timecode_on_stdout = true; + break; + case OPTION_10_BIT_INPUT: + global_flags.ten_bit_input = true; + break; case OPTION_HELP: usage(); exit(0); @@ -324,6 +394,11 @@ void parse_flags(int argc, char * const argv[]) fprintf(stderr, "ERROR: --num-cards must be at least 1\n"); exit(1); } + if (global_flags.output_card < -1 || + global_flags.output_card >= global_flags.num_cards) { + fprintf(stderr, "ERROR: --output-card points to a nonexistant card\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"); @@ -353,4 +428,53 @@ void parse_flags(int argc, char * const argv[]) exit(1); } } + + // Rec. 709 would be the sane thing to do, but it seems many players + // just default to BT.601 coefficients no matter what. We _do_ set + // the right flags, so that a player that works properly doesn't have + // to guess, but it's frequently ignored. See discussions + // in e.g. https://trac.ffmpeg.org/ticket/4978; the situation with + // browsers is complicated and depends on things like hardware acceleration + // (https://bugs.chromium.org/p/chromium/issues/detail?id=333619 for + // extensive discussion). VLC generally fixed this as part of 3.0.0 + // (see e.g. https://github.com/videolan/vlc/commit/bc71288b2e38c07d6921472824b92eef1aa85f7e + // and https://github.com/videolan/vlc/commit/c3fc2683a9cde1d42674ebf9935dced05733a215), + // but earlier versions were pretty random. + // + // On the other hand, HDMI/SDI output typically requires Rec. 709 for + // HD resolutions (with no way of signaling anything else), which is + // a conflicting demand. In this case, we typically let the HDMI/SDI + // output win if it is active, but the user can override this. + if (output_ycbcr_coefficients == "auto") { + // Essentially: BT.709 if HDMI/SDI output is on, otherwise BT.601. + global_flags.ycbcr_rec709_coefficients = false; + global_flags.ycbcr_auto_coefficients = true; + } else if (output_ycbcr_coefficients == "rec709") { + global_flags.ycbcr_rec709_coefficients = true; + global_flags.ycbcr_auto_coefficients = false; + } else if (output_ycbcr_coefficients == "rec601") { + global_flags.ycbcr_rec709_coefficients = false; + global_flags.ycbcr_auto_coefficients = false; + } else { + fprintf(stderr, "ERROR: --output-ycbcr-coefficients must be “rec601”, “rec709” or “auto”\n"); + exit(1); + } + + if (global_flags.output_buffer_frames < 0.0f) { + // Actually, even zero probably won't make sense; there is some internal + // delay to the card. + fprintf(stderr, "ERROR: --output-buffer-frames can't be negative.\n"); + exit(1); + } + if (global_flags.output_slop_frames < 0.0f) { + fprintf(stderr, "ERROR: --output-slop-frames can't be negative.\n"); + exit(1); + } + if (global_flags.max_input_queue_frames < 1) { + fprintf(stderr, "ERROR: --max-input-queue-frames must be at least 1.\n"); + exit(1); + } + if (global_flags.max_input_queue_frames > 10) { + fprintf(stderr, "WARNING: --max-input-queue-frames has little effect over 10.\n"); + } }