Release Nageru 1.3.0.

[nageru] / flags.cpp

diff --git a/flags.cpp b/flags.cpp
index 7e8beaf84dab139a978b33d9bc1302949419f0d1..06add31d388d2e844018555ef3e146fa036b4920 100644 (file)
--- a/flags.cpp
+++ b/flags.cpp
@@ -25,12 +25,15 @@ void usage()
        fprintf(stderr, "      --http-x264-video           send x264-compressed video to HTTP clients\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-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");
        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");
        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");
@@ -58,9 +61,12 @@ void parse_flags(int argc, char * const argv[])
                { "http-x264-video", no_argument, 0, 1008 },
                { "x264-preset", required_argument, 0, 1009 },
                { "x264-tune", required_argument, 0, 1010 },
+               { "x264-speedcontrol", no_argument, 0, 1015 },
+               { "x264-speedcontrol-verbose", no_argument, 0, 1016 },
                { "x264-bitrate", required_argument, 0, 1011 },
                { "x264-vbv-bufsize", required_argument, 0, 1012 },
                { "x264-vbv-max-bitrate", required_argument, 0, 1013 },
+               { "x264-param", required_argument, 0, 1017 },
                { "http-mux", required_argument, 0, 1004 },
                { "http-coarse-timebase", no_argument, 0, 1005 },
                { "http-audio-codec", required_argument, 0, 1006 },
@@ -128,6 +134,12 @@ void parse_flags(int argc, char * const argv[])
                case 1010:
                        global_flags.x264_tune = optarg;
                        break;
+               case 1015:
+                       global_flags.x264_speedcontrol = true;
+                       break;
+               case 1016:
+                       global_flags.x264_speedcontrol_verbose = true;
+                       break;
                case 1011:
                        global_flags.x264_bitrate = atoi(optarg);
                        break;
@@ -137,6 +149,9 @@ void parse_flags(int argc, char * const argv[])
                case 1013:
                        global_flags.x264_vbv_max_bitrate = atoi(optarg);
                        break;
+               case 1017:
+                       global_flags.x264_extra_param.push_back(optarg);
+                       break;
                case 1002:
                        global_flags.flat_audio = true;
                        break;
@@ -162,6 +177,15 @@ void parse_flags(int argc, char * const argv[])
                fprintf(stderr, "ERROR: --http-uncompressed-video and --http-x264-video are mutually incompatible\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");
+               }
+               global_flags.x264_preset = "faster";
+       } else if (global_flags.x264_preset.empty()) {
+               global_flags.x264_preset = X264_DEFAULT_PRESET;
+       }
+
        for (pair<int, int> mapping : global_flags.default_stream_mapping) {
                if (mapping.second >= global_flags.num_cards) {
                        fprintf(stderr, "ERROR: Signal %d mapped to card %d, which doesn't exist (try adjusting --num-cards)\n",