X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=flags.cpp;h=25f11b46d9fbe835a1e03dbaafcf67162fd360b5;hb=16c0e5da7fa7b4eeea79470c24697a1ba193f071;hp=f782c769cbc0329aacce8178c40a08442e03bdbc;hpb=a29ee5d5544e6a5613b14ca31d4107b8846859c5;p=nageru

diff --git a/flags.cpp b/flags.cpp
index f782c76..25f11b4 100644
--- a/flags.cpp
+++ b/flags.cpp
@@ -3,6 +3,11 @@
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
+#include <utility>
+
+using namespace std;
 
 Flags global_flags;
 
@@ -15,10 +20,13 @@ void usage()
 	fprintf(stderr, "  -t, --theme=FILE                choose theme (default theme.lua)\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");
 	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, "      --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");
@@ -46,11 +54,14 @@ void parse_flags(int argc, char * const argv[])
 		{ "help", no_argument, 0, 'h' },
 		{ "num-cards", required_argument, 0, 'c' },
 		{ "theme", required_argument, 0, 't' },
+		{ "map-signal", required_argument, 0, 'm' },
 		{ "va-display", required_argument, 0, 1000 },
 		{ "http-uncompressed-video", no_argument, 0, 1001 },
 		{ "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 },
@@ -77,6 +88,23 @@ void parse_flags(int argc, char * const argv[])
 		case 't':
 			global_flags.theme_filename = optarg;
 			break;
+		case 'm': {
+			char *ptr = strchr(optarg, ',');
+			if (ptr == nullptr) {
+				fprintf(stderr, "ERROR: Invalid argument '%s' to --map-signal (needs a signal and a card number, separated by comma)\n", optarg);
+				exit(1);
+			}
+			*ptr = '\0';
+			const int signal_num = atoi(optarg);
+			const int card_num = atoi(ptr + 1);
+			if (global_flags.default_stream_mapping.count(signal_num)) {
+				fprintf(stderr, "ERROR: Signal %d already mapped to card %d\n",
+					signal_num, global_flags.default_stream_mapping[signal_num]);
+				exit(1);
+			}
+			global_flags.default_stream_mapping[signal_num] = card_num;
+			break;
+		}
 		case 1000:
 			global_flags.va_display = optarg;
 			break;
@@ -104,6 +132,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;
@@ -138,4 +172,20 @@ 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",
+				mapping.first, mapping.second);
+			exit(1);
+		}
+	}
 }