Release Nageru 1.5.0.

[nageru] / flags.cpp

diff --git a/flags.cpp b/flags.cpp
index 88a2c458221bbd26a14797bb31542f1035f56ba8..acd054181c2403de736d7b0fe1cbef8d734761be 100644 (file)
--- 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,
@@ -54,6 +56,7 @@ enum LongOption {
        OPTION_TIMECODE_STREAM,
        OPTION_TIMECODE_STDOUT,
        OPTION_10_BIT_INPUT,
+       OPTION_10_BIT_OUTPUT,
 };
 
 void usage()
@@ -76,12 +79,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");
@@ -125,6 +131,8 @@ void usage()
        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");
 }
 
 void parse_flags(int argc, char * const argv[])
@@ -145,11 +153,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 },
@@ -180,6 +190,7 @@ void parse_flags(int argc, char * const argv[])
                { "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 },
                { 0, 0, 0, 0 }
        };
        vector<string> theme_dirs;
@@ -261,6 +272,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;
@@ -276,6 +291,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;
@@ -360,6 +378,12 @@ void parse_flags(int argc, char * const argv[])
                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_HELP:
                        usage();
                        exit(0);
@@ -463,4 +487,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;
+       }
 }