X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fflags.cpp;h=bd807319c92fcb649073e2a5fe683686543a7f51;hb=f34a3e1bbc207541842e0b54d5418d95bafc8e5b;hp=2bd0eeca0aa183b01f13c4ba03dfbb1ecf831d17;hpb=8bb8bb7cc9700befab35a8cc2c4b7a88f0638af9;p=nageru

diff --git a/nageru/flags.cpp b/nageru/flags.cpp
index 2bd0eec..bd80731 100644
--- a/nageru/flags.cpp
+++ b/nageru/flags.cpp
@@ -78,6 +78,7 @@ enum LongOption {
 	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,
@@ -251,9 +252,7 @@ void usage(Program program)
 		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");
@@ -344,10 +343,14 @@ void parse_flags(Program program, int argc, char * const argv[])
 		{ "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<string> theme_dirs;
@@ -460,7 +463,6 @@ void parse_flags(Program program, int argc, char * const argv[])
 			break;
 		case OPTION_RECORD_X264_VIDEO:
 			global_flags.x264_video_to_disk = true;
-			global_flags.x264_video_to_http = true;
 			break;
 		case OPTION_SEPARATE_X264_DISK_ENCODE:
 			global_flags.x264_video_to_disk = true;
@@ -614,11 +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_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, ',');
@@ -697,15 +703,15 @@ void parse_flags(Program program, int argc, char * const argv[])
 		fprintf(stderr, "ERROR: --http-{uncompressed,x264,av1}-video are mutually incompatible\n");
 		exit(1);
 	}
-	if (global_flags.ten_bit_output) {
+	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) {
-			fprintf(stderr, "ERROR: 10-bit AV1 output is not supported yet\n");
-			exit(1);
-		} else {
+		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);