X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=flags.cpp;h=fc1bc886dfba392a214caec0838ff6a73e4988bb;hb=2fa5654e76175e660dfd834df6e85040bba358eb;hp=f81f96d65aea9eab5853ace1027d5d1387a30160;hpb=f4aeb51805407d8251e3470aa1b34a3bdef4cbe3;p=nageru diff --git a/flags.cpp b/flags.cpp index f81f96d..fc1bc88 100644 --- a/flags.cpp +++ b/flags.cpp @@ -19,11 +19,13 @@ 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, OPTION_X264_SPEEDCONTROL_VERBOSE, OPTION_X264_BITRATE, + OPTION_X264_CRF, OPTION_X264_VBV_BUFSIZE, OPTION_X264_VBV_MAX_BITRATE, OPTION_X264_PARAM, @@ -46,10 +48,16 @@ enum LongOption { OPTION_DISABLE_ALSA_OUTPUT, OPTION_NO_FLUSH_PBOS, OPTION_PRINT_VIDEO_LATENCY, + 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, + OPTION_10_BIT_OUTPUT, + OPTION_INPUT_YCBCR_INTERPRETATION, }; void usage() @@ -63,6 +71,7 @@ void usage() 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, " -r, --recording-dir=DIR where to store disk recording\n"); fprintf(stderr, " -v, --va-display=SPEC VA-API device for H.264 encoding\n"); fprintf(stderr, " ($DISPLAY spec or /dev/dri/render* path)\n"); fprintf(stderr, " -m, --map-signal=SIGNAL,CARD set a default card mapping (can be given multiple times)\n"); @@ -72,12 +81,15 @@ 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"); fprintf(stderr, " --x264-speedcontrol-verbose output speedcontrol debugging statistics\n"); fprintf(stderr, " --x264-bitrate x264 bitrate (in kilobit/sec, default %d)\n", DEFAULT_X264_OUTPUT_BIT_RATE); + fprintf(stderr, " --x264-crf=VALUE quality-based VBR (-12 to 51), incompatible with --x264-bitrate and VBV\n"); fprintf(stderr, " --x264-vbv-bufsize x264 VBV size (in kilobits, 0 = one-frame VBV,\n"); 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"); @@ -105,17 +117,28 @@ 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, " --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 rec709 if and only if --output-card is used\n"); - fprintf(stderr, " and a HD resolution is set\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"); + fprintf(stderr, " --10-bit-output use 10-bit video output (requires compute shaders,\n"); + fprintf(stderr, " implies --record-x264-video)\n"); + fprintf(stderr, " --input-ycbcr-interpretation=CARD,{rec601,rec709,auto}[,{limited,full}]\n"); + 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"); } void parse_flags(int argc, char * const argv[]) @@ -128,6 +151,7 @@ void parse_flags(int argc, char * const argv[]) { "output-card", required_argument, 0, 'o' }, { "theme", required_argument, 0, 't' }, { "theme-dir", required_argument, 0, 'I' }, + { "recording-dir", required_argument, 0, 'r' }, { "map-signal", required_argument, 0, 'm' }, { "input-mapping", required_argument, 0, 'M' }, { "va-display", required_argument, 0, 'v' }, @@ -136,11 +160,13 @@ 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 }, { "x264-speedcontrol-verbose", no_argument, 0, OPTION_X264_SPEEDCONTROL_VERBOSE }, { "x264-bitrate", required_argument, 0, OPTION_X264_BITRATE }, + { "x264-crf", required_argument, 0, OPTION_X264_CRF }, { "x264-vbv-bufsize", required_argument, 0, OPTION_X264_VBV_BUFSIZE }, { "x264-vbv-max-bitrate", required_argument, 0, OPTION_X264_VBV_MAX_BITRATE }, { "x264-param", required_argument, 0, OPTION_X264_PARAM }, @@ -163,17 +189,23 @@ 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 }, + { "10-bit-output", no_argument, 0, OPTION_10_BIT_OUTPUT }, + { "input-ycbcr-interpretation", required_argument, 0, OPTION_INPUT_YCBCR_INTERPRETATION }, { 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); + int c = getopt_long(argc, argv, "c:t:I:r:v:m:M:w:h:", long_options, &option_index); if (c == -1) { break; @@ -197,6 +229,9 @@ void parse_flags(int argc, char * const argv[]) case 'I': theme_dirs.push_back(optarg); break; + case 'r': + global_flags.recording_dir = optarg; + break; case 'm': { char *ptr = strchr(optarg, ','); if (ptr == nullptr) { @@ -248,6 +283,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; @@ -263,6 +302,9 @@ void parse_flags(int argc, char * const argv[]) case OPTION_X264_BITRATE: global_flags.x264_bitrate = atoi(optarg); break; + case OPTION_X264_CRF: + global_flags.x264_crf = atof(optarg); + break; case OPTION_X264_VBV_BUFSIZE: global_flags.x264_vbv_buffer_size = atoi(optarg); break; @@ -323,6 +365,9 @@ 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; @@ -335,6 +380,69 @@ void parse_flags(int argc, char * const argv[]) 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_10_BIT_OUTPUT: + global_flags.ten_bit_output = true; + global_flags.x264_video_to_disk = true; + global_flags.x264_video_to_http = true; + global_flags.x264_bit_depth = 10; + break; + case OPTION_INPUT_YCBCR_INTERPRETATION: { + char *ptr = strchr(optarg, ','); + if (ptr == nullptr) { + fprintf(stderr, "ERROR: Invalid argument '%s' to --input-ycbcr-interpretation (needs a card and an interpretation, separated by comma)\n", optarg); + exit(1); + } + *ptr = '\0'; + const int card_num = atoi(optarg); + if (card_num < 0 || card_num >= MAX_VIDEO_CARDS) { + fprintf(stderr, "ERROR: Invalid card number %d\n", card_num); + exit(1); + } + + YCbCrInterpretation interpretation; + char *interpretation_str = ptr + 1; + ptr = strchr(interpretation_str, ','); + if (ptr != nullptr) { + *ptr = '\0'; + const char *range = ptr + 1; + if (strcmp(range, "full") == 0) { + interpretation.full_range = true; + } else if (strcmp(range, "limited") == 0) { + interpretation.full_range = false; + } else { + fprintf(stderr, "ERROR: Invalid Y'CbCr range '%s' (must be “full” or “limited”)\n", range); + exit(1); + } + } + + if (strcmp(interpretation_str, "rec601") == 0) { + interpretation.ycbcr_coefficients_auto = false; + interpretation.ycbcr_coefficients = movit::YCBCR_REC_601; + } else if (strcmp(interpretation_str, "rec709") == 0) { + interpretation.ycbcr_coefficients_auto = false; + interpretation.ycbcr_coefficients = movit::YCBCR_REC_709; + } else if (strcmp(interpretation_str, "auto") == 0) { + interpretation.ycbcr_coefficients_auto = true; + if (interpretation.full_range) { + fprintf(stderr, "ERROR: Cannot use “auto” Y'CbCr coefficients with full range\n"); + exit(1); + } + } else { + fprintf(stderr, "ERROR: Invalid Y'CbCr coefficients '%s' (must be “rec601”, “rec709” or “auto”)\n", interpretation_str); + exit(1); + } + global_flags.ycbcr_interpretation[card_num] = interpretation; + break; + } case OPTION_HELP: usage(); exit(0); @@ -405,17 +513,17 @@ void parse_flags(int argc, char * const argv[]) // 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, but the user can override this. + // output win if it is active, but the user can override this. if (output_ycbcr_coefficients == "auto") { - if (global_flags.output_card >= 0 && global_flags.width >= 1280) { - global_flags.ycbcr_rec709_coefficients = true; - } else { - global_flags.ycbcr_rec709_coefficients = false; - } + // 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); @@ -431,4 +539,23 @@ void parse_flags(int argc, char * const argv[]) 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"); + } + + if (!isinf(global_flags.x264_crf)) { // CRF mode is selected. + if (global_flags.x264_bitrate != -1) { + fprintf(stderr, "ERROR: --x264-bitrate and --x264-crf are mutually incompatible.\n"); + exit(1); + } + if (global_flags.x264_vbv_max_bitrate != -1 && global_flags.x264_vbv_buffer_size != -1) { + fprintf(stderr, "WARNING: VBV settings are ignored with --x264-crf.\n"); + } + } else if (global_flags.x264_bitrate == -1) { + global_flags.x264_bitrate = DEFAULT_X264_OUTPUT_BIT_RATE; + } }