Fix the channel names in the analyzer.

[nageru] / flags.cpp

diff --git a/flags.cpp b/flags.cpp
index ee575c57863984621386dcbcee11781857afa222..f7a29f7330eb34f218d1146c97ddf438b7441352 100644 (file)
--- a/flags.cpp
+++ b/flags.cpp
@@ -25,6 +25,7 @@ enum LongOption {
        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,
@@ -69,6 +70,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");
@@ -86,6 +88,7 @@ void usage()
        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");
@@ -143,6 +146,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' },
@@ -157,6 +161,7 @@ void parse_flags(int argc, char * const argv[])
                { "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 },
@@ -194,7 +199,7 @@ void parse_flags(int argc, char * const argv[])
        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;
@@ -218,6 +223,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) {
@@ -288,6 +296,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;
@@ -481,4 +492,16 @@ void parse_flags(int argc, char * const argv[])
        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;
+       }
 }