Release Nageru 1.5.0.

[nageru] / flags.cpp

diff --git a/flags.cpp b/flags.cpp
index e6c306be52d23b38614aa8361aac6331404c5cca..acd054181c2403de736d7b0fe1cbef8d734761be 100644 (file)
--- a/flags.cpp
+++ b/flags.cpp
@@ -25,9 +25,9 @@ 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_10_BIT,
        OPTION_X264_PARAM,
        OPTION_HTTP_MUX,
        OPTION_HTTP_COARSE_TIMEBASE,
@@ -56,6 +56,7 @@ enum LongOption {
        OPTION_TIMECODE_STREAM,
        OPTION_TIMECODE_STDOUT,
        OPTION_10_BIT_INPUT,
+       OPTION_10_BIT_OUTPUT,
 };
 
 void usage()
@@ -86,11 +87,11 @@ 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");
        fprintf(stderr, "                                  0 = no limit, default: same as --x264-bitrate, i.e., CBR)\n");
-       fprintf(stderr, "      --x264-10-bit               enable 10-bit x264 encoding\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");
@@ -130,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[])
@@ -156,9 +159,9 @@ 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-10-bit", no_argument, 0, OPTION_X264_10_BIT },
                { "x264-param", required_argument, 0, OPTION_X264_PARAM },
                { "http-mux", required_argument, 0, OPTION_HTTP_MUX },
                { "http-coarse-timebase", no_argument, 0, OPTION_HTTP_COARSE_TIMEBASE },
@@ -187,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;
@@ -287,12 +291,12 @@ 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;
-               case OPTION_X264_10_BIT:
-                       global_flags.x264_bit_depth = 10;
-                       break;
                case OPTION_X264_VBV_MAX_BITRATE:
                        global_flags.x264_vbv_max_bitrate = atoi(optarg);
                        break;
@@ -374,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);
@@ -477,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;
+       }
 }