X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fflags.cpp;h=bd807319c92fcb649073e2a5fe683686543a7f51;hb=f34a3e1bbc207541842e0b54d5418d95bafc8e5b;hp=769263bb771adfb55667f39170d6dd4492100005;hpb=11b2ae4ae768b87a4af6f0f50ba39bd75133dbb4;p=nageru diff --git a/nageru/flags.cpp b/nageru/flags.cpp index 769263b..bd80731 100644 --- a/nageru/flags.cpp +++ b/nageru/flags.cpp @@ -23,7 +23,9 @@ enum LongOption { OPTION_V4L_OUTPUT, OPTION_HTTP_UNCOMPRESSED_VIDEO, OPTION_HTTP_X264_VIDEO, + OPTION_HTTP_AV1_VIDEO, OPTION_RECORD_X264_VIDEO, + OPTION_SEPARATE_X264_DISK_ENCODE, OPTION_X264_PRESET, OPTION_X264_TUNE, OPTION_X264_SPEEDCONTROL, @@ -33,6 +35,15 @@ enum LongOption { OPTION_X264_VBV_BUFSIZE, OPTION_X264_VBV_MAX_BITRATE, OPTION_X264_PARAM, + OPTION_X264_SEPARATE_DISK_PRESET, + OPTION_X264_SEPARATE_DISK_TUNE, + OPTION_X264_SEPARATE_DISK_BITRATE, + OPTION_X264_SEPARATE_DISK_CRF, + OPTION_X264_SEPARATE_DISK_PARAM, + OPTION_AV1_PRESET, + OPTION_AV1_BITRATE, + OPTION_AV1_FPS, + OPTION_AV1_PARAM, OPTION_HTTP_MUX, OPTION_HTTP_COARSE_TIMEBASE, OPTION_HTTP_AUDIO_CODEC, @@ -63,9 +74,11 @@ enum LongOption { OPTION_OUTPUT_YCBCR_COEFFICIENTS, OPTION_OUTPUT_BUFFER_FRAMES, OPTION_OUTPUT_SLOP_FRAMES, + OPTION_OUTPUT_CARD_UNSYNCHRONIZED, OPTION_TIMECODE_STREAM, OPTION_TIMECODE_STDOUT, OPTION_QUICK_CUT_KEYS, + OPTION_10_BIT, OPTION_10_BIT_INPUT, OPTION_10_BIT_OUTPUT, OPTION_INPUT_YCBCR_INTERPRETATION, @@ -154,6 +167,8 @@ void usage(Program program) 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, " --separate-x264-disk-encode run a different x264 encoder for disk recording\n"); + fprintf(stderr, " (implies --record-x264-video)\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"); @@ -167,6 +182,25 @@ void usage(Program program) 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-param=NAME[,VALUE] set any x264 parameter, for fine tuning\n"); + if (program == PROGRAM_NAGERU) { + fprintf(stderr, " --x264-separate-disk-preset x264 quality preset (default " X264_DEFAULT_PRESET ")\n"); + fprintf(stderr, " --x264-separate-disk-tune x264 tuning (default " X264_DEFAULT_TUNE ", can be blank)\n"); + fprintf(stderr, " --x264-separate-disk-bitrate x264 bitrate (in kilobit/sec, default %d)\n", + DEFAULT_X264_OUTPUT_BIT_RATE); + fprintf(stderr, " --x264-separate-disk-crf=VALUE quality-based VBR (-12 to 51), \n"); + fprintf(stderr, " incompatible with --x264-separate-disk-bitrate\n"); + fprintf(stderr, " --x264-separate-disk-param=NAME[,VALUE] set any x264 parameter, for fine tuning\n"); + } +#ifdef HAVE_AV1 + fprintf(stderr, " --http-av1-video send AV1-compressed video to HTTP clients\n"); + fprintf(stderr, " --av1-preset SVT-AV1 quality preset (default %d, from -2 to 13)\n", + DEFAULT_AV1_PRESET); + fprintf(stderr, " --av1-bitrate AV1 bitrate (in kilobit/sec, default %d)\n", + DEFAULT_AV1_OUTPUT_BIT_RATE); + fprintf(stderr, " --av1-fps=NUM[/DEN] AV1 encoded frame rate (default %d/%d)\n", + DEFAULT_AV1_FPS_NUM, DEFAULT_AV1_FPS_DEN); + fprintf(stderr, " --av1-param=NAME[,VALUE] set any SVT-AV1 parameter, for fine tuning\n"); +#endif 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"); fprintf(stderr, " (default is to use the same as for the recording)\n"); @@ -213,12 +247,12 @@ void usage(Program program) 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, " --output-card-unsynchronized if --output-card is in use, do _not_ use it as\n"); + fprintf(stderr, " master clock (may give jittery output and audio breakups)\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"); + fprintf(stderr, " --10-bit use 10-bit color depth\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"); @@ -254,6 +288,7 @@ void parse_flags(Program program, int argc, char * const argv[]) { "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 }, + { "separate-x264-disk-encode", no_argument, 0, OPTION_SEPARATE_X264_DISK_ENCODE }, { "x264-preset", required_argument, 0, OPTION_X264_PRESET }, { "x264-tune", required_argument, 0, OPTION_X264_TUNE }, { "x264-speedcontrol", no_argument, 0, OPTION_X264_SPEEDCONTROL }, @@ -263,6 +298,18 @@ void parse_flags(Program program, int argc, char * const argv[]) { "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 }, + { "x264-separate-disk-preset", required_argument, 0, OPTION_X264_SEPARATE_DISK_PRESET }, + { "x264-separate-disk-tune", required_argument, 0, OPTION_X264_SEPARATE_DISK_TUNE }, + { "x264-separate-disk-bitrate", required_argument, 0, OPTION_X264_SEPARATE_DISK_BITRATE }, + { "x264-separate-disk-crf", required_argument, 0, OPTION_X264_SEPARATE_DISK_CRF }, + { "x264-separate-disk-param", required_argument, 0, OPTION_X264_SEPARATE_DISK_PARAM }, +#ifdef HAVE_AV1 + { "http-av1-video", no_argument, 0, OPTION_HTTP_AV1_VIDEO }, + { "av1-preset", required_argument, 0, OPTION_AV1_PRESET }, + { "av1-bitrate", required_argument, 0, OPTION_AV1_BITRATE }, + { "av1-fps", required_argument, 0, OPTION_AV1_FPS }, + { "av1-param", required_argument, 0, OPTION_AV1_PARAM }, +#endif { "http-mux", required_argument, 0, OPTION_HTTP_MUX }, { "http-audio-codec", required_argument, 0, OPTION_HTTP_AUDIO_CODEC }, { "http-audio-bitrate", required_argument, 0, OPTION_HTTP_AUDIO_BITRATE }, @@ -292,13 +339,18 @@ void parse_flags(Program program, int argc, char * const argv[]) { "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 }, + { "output-card-unsynchronized", no_argument, 0, OPTION_OUTPUT_CARD_UNSYNCHRONIZED }, { "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 }, + { "10-bit", no_argument, 0, OPTION_10_BIT }, { "input-ycbcr-interpretation", required_argument, 0, OPTION_INPUT_YCBCR_INTERPRETATION }, { "mjpeg-export-cards", required_argument, 0, OPTION_MJPEG_EXPORT_CARDS }, + + // Deprecated variants. + { "10-bit-input", no_argument, 0, OPTION_10_BIT_INPUT }, + { "10-bit-output", no_argument, 0, OPTION_10_BIT_OUTPUT }, + { 0, 0, 0, 0 } }; vector theme_dirs; @@ -410,8 +462,15 @@ void parse_flags(Program program, int argc, char * const argv[]) global_flags.x264_video_to_http = true; break; case OPTION_RECORD_X264_VIDEO: + global_flags.x264_video_to_disk = true; + break; + case OPTION_SEPARATE_X264_DISK_ENCODE: global_flags.x264_video_to_disk = true; global_flags.x264_video_to_http = true; + global_flags.x264_separate_disk_encode = true; + break; + case OPTION_HTTP_AV1_VIDEO: + global_flags.av1_video_to_http = true; break; case OPTION_X264_PRESET: global_flags.x264_preset = optarg; @@ -440,6 +499,44 @@ void parse_flags(Program program, int argc, char * const argv[]) case OPTION_X264_PARAM: global_flags.x264_extra_param.push_back(optarg); break; + case OPTION_X264_SEPARATE_DISK_PRESET: + global_flags.x264_separate_disk_preset = optarg; + break; + case OPTION_X264_SEPARATE_DISK_TUNE: + global_flags.x264_separate_disk_tune = optarg; + break; + case OPTION_X264_SEPARATE_DISK_BITRATE: + global_flags.x264_separate_disk_bitrate = atoi(optarg); + break; + case OPTION_X264_SEPARATE_DISK_CRF: + global_flags.x264_separate_disk_crf = atof(optarg); + break; + case OPTION_X264_SEPARATE_DISK_PARAM: + global_flags.x264_separate_disk_extra_param.push_back(optarg); + break; + case OPTION_AV1_PRESET: + global_flags.av1_preset = atoi(optarg); + break; + case OPTION_AV1_BITRATE: + global_flags.av1_bitrate = atoi(optarg); + break; + case OPTION_AV1_FPS: { + string str = optarg; + const size_t pos = str.find('/'); + if (pos == string::npos) { + global_flags.av1_fps_num = stoi(str); + global_flags.av1_fps_den = 1; + } else { + const string num = str.substr(0, pos); + const string den = str.substr(pos + 1); + global_flags.av1_fps_num = stoi(num); + global_flags.av1_fps_den = stoi(den); + } + break; + } + case OPTION_AV1_PARAM: + global_flags.av1_extra_param.push_back(optarg); + break; case OPTION_FLAT_AUDIO: // If --flat-audio is given, turn off everything that messes with the sound, // except the final makeup gain. @@ -506,6 +603,9 @@ void parse_flags(Program program, int argc, char * const argv[]) case OPTION_OUTPUT_SLOP_FRAMES: global_flags.output_slop_frames = atof(optarg); break; + case OPTION_OUTPUT_CARD_UNSYNCHRONIZED: + global_flags.output_card_is_master = false; + break; case OPTION_TIMECODE_STREAM: global_flags.display_timecode_in_stream = true; break; @@ -516,13 +616,15 @@ void parse_flags(Program program, int argc, char * const argv[]) global_flags.enable_quick_cut_keys = true; break; case OPTION_10_BIT_INPUT: - global_flags.ten_bit_input = true; + fprintf(stderr, "NOTE: --10-bit-input is a deprecated alias for --10-bit.\n"); + global_flags.bit_depth = 10; 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; + fprintf(stderr, "NOTE: --10-bit-output is a deprecated alias for --10-bit.\n"); + global_flags.bit_depth = 10; + break; + case OPTION_10_BIT: + global_flags.bit_depth = 10; break; case OPTION_INPUT_YCBCR_INTERPRETATION: { char *ptr = strchr(optarg, ','); @@ -595,11 +697,21 @@ void parse_flags(Program program, int argc, char * const argv[]) } } - if (global_flags.uncompressed_video_to_http && - global_flags.x264_video_to_http) { - fprintf(stderr, "ERROR: --http-uncompressed-video and --http-x264-video are mutually incompatible\n"); + if (global_flags.uncompressed_video_to_http + + global_flags.x264_video_to_http + + global_flags.av1_video_to_http > 1) { + fprintf(stderr, "ERROR: --http-{uncompressed,x264,av1}-video are mutually incompatible\n"); exit(1); } + if (global_flags.bit_depth == 10) { + global_flags.x264_video_to_disk = true; // No 10-bit Quick Sync support. + if (!global_flags.av1_video_to_http) { + global_flags.x264_video_to_http = true; + } + } + if (global_flags.x264_video_to_disk && !global_flags.uncompressed_video_to_http && !global_flags.av1_video_to_http) { + global_flags.x264_video_to_http = true; // Quick Sync to HTTP but x264 to disk doesn't make sense. + } if (global_flags.min_num_cards <= 0) { fprintf(stderr, "ERROR: --num-cards must be at least 1\n"); exit(1); @@ -630,6 +742,9 @@ void parse_flags(Program program, int argc, char * const argv[]) } else if (global_flags.x264_preset.empty()) { global_flags.x264_preset = X264_DEFAULT_PRESET; } + if (global_flags.x264_separate_disk_preset.empty()) { + global_flags.x264_separate_disk_preset = X264_DEFAULT_PRESET; + } if (!theme_dirs.empty()) { global_flags.theme_dirs = theme_dirs; } @@ -713,6 +828,15 @@ void parse_flags(Program program, int argc, char * const argv[]) global_flags.x264_bitrate = DEFAULT_X264_OUTPUT_BIT_RATE; } + if (!isinf(global_flags.x264_separate_disk_crf)) { // CRF mode is selected. + if (global_flags.x264_separate_disk_bitrate != -1) { + fprintf(stderr, "ERROR: --x264-separate-disk-bitrate and --x264-separate-disk-crf are mutually incompatible.\n"); + exit(1); + } + } else if (global_flags.x264_separate_disk_bitrate == -1) { + global_flags.x264_separate_disk_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.max_num_cards); ++card_idx) {