OPTION_HTTP_AUDIO_BITRATE,
OPTION_HTTP_PORT,
OPTION_NO_TRANSCODE_AUDIO,
+ OPTION_DISABLE_AUDIO,
OPTION_FLAT_AUDIO,
OPTION_GAIN_STAGING,
OPTION_DISABLE_LOCUT,
OPTION_10_BIT_INPUT,
OPTION_10_BIT_OUTPUT,
OPTION_INPUT_YCBCR_INTERPRETATION,
+ OPTION_MJPEG_EXPORT_CARDS,
};
+map<unsigned, unsigned> parse_mjpeg_export_cards(char *optarg)
+{
+ map<unsigned, unsigned> ret;
+ if (optarg[0] == '\0') {
+ return ret;
+ }
+
+ unsigned stream_idx = 0;
+ char *start = optarg;
+ for ( ;; ) {
+ char *end = strchr(start, ',');
+ if (end != nullptr) {
+ *end = '\0';
+ }
+
+ unsigned range_begin, range_end;
+ if (sscanf(start, "%u-%u", &range_begin, &range_end) != 2) {
+ range_begin = range_end = atoi(start);
+ }
+ if (range_end < range_begin) {
+ fprintf(stderr, "ERROR: Invalid range %u-%u in --mjpeg-export-cards=\n", range_begin, range_end);
+ exit(1);
+ }
+ if (range_end >= unsigned(global_flags.num_cards)) {
+ // There are situations where we could possibly want to
+ // include FFmpeg inputs (CEF inputs are unlikely),
+ // but they're not necessarily in 4:2:2 Y'CbCr, so it would
+ // require more functionality the the JPEG encoder.
+ fprintf(stderr, "ERROR: Asked for (zero-indexed) card %u in --mjpeg-export-cards=, but there are only %u cards\n",
+ range_end, global_flags.num_cards);
+ exit(1);
+ }
+ for (unsigned card_idx = range_begin; card_idx <= range_end; ++card_idx) {
+ if (ret.count(card_idx)) {
+ fprintf(stderr, "ERROR: Card %u was given twice in --mjpeg-export-cards=\n", card_idx);
+ exit(1);
+ }
+ ret[card_idx] = stream_idx++;
+ }
+ if (end == nullptr) {
+ break;
+ } else {
+ start = end + 1;
+ }
+ }
+ return ret;
+}
+
void usage(Program program)
{
if (program == PROGRAM_KAERU) {
if (program == PROGRAM_KAERU) {
fprintf(stderr, " --no-transcode-audio copy encoded audio raw from the source stream\n");
fprintf(stderr, " (requires --http-audio-codec= to be set)\n");
+ fprintf(stderr, " --disable-audio do not include any audio in the stream\n");
}
if (program == PROGRAM_NAGERU) {
fprintf(stderr, " --flat-audio start with most audio processing turned off\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");
fprintf(stderr, " limited means standard 0-240/0-235 input range (for 8-bit)\n");
+ fprintf(stderr, " --mjpeg-export-cards=RANGE[,RANGE...]\n");
+ fprintf(stderr, " export the given cards in MJPEG format to /multicam.mp4,\n");
+ fprintf(stderr, " in the given order (ranges can be either single card indexes\n");
+ fprintf(stderr, " or pairs like 1-3 for camera 1,2,3; default is all cards)\n");
}
}
{ "http-audio-bitrate", required_argument, 0, OPTION_HTTP_AUDIO_BITRATE },
{ "http-port", required_argument, 0, OPTION_HTTP_PORT },
{ "no-transcode-audio", no_argument, 0, OPTION_NO_TRANSCODE_AUDIO },
+ { "disable-audio", no_argument, 0, OPTION_DISABLE_AUDIO },
{ "flat-audio", no_argument, 0, OPTION_FLAT_AUDIO },
{ "gain-staging", required_argument, 0, OPTION_GAIN_STAGING },
{ "disable-locut", no_argument, 0, OPTION_DISABLE_LOCUT },
{ "10-bit-input", no_argument, 0, OPTION_10_BIT_INPUT },
{ "10-bit-output", no_argument, 0, OPTION_10_BIT_OUTPUT },
{ "input-ycbcr-interpretation", required_argument, 0, OPTION_INPUT_YCBCR_INTERPRETATION },
+ { "mjpeg-export-cards", required_argument, 0, OPTION_MJPEG_EXPORT_CARDS },
{ 0, 0, 0, 0 }
};
vector<string> theme_dirs;
string output_ycbcr_coefficients = "auto";
+ bool card_to_mjpeg_stream_export_set = false;
for ( ;; ) {
int option_index = 0;
- int c = getopt_long(argc, argv, "c:t:I:r:v:m:M:w:h:", long_options, &option_index);
+ int c = getopt_long(argc, argv, "c:o:t:I:r:v:m:M:w:h:", long_options, &option_index);
if (c == -1) {
break;
case OPTION_NO_TRANSCODE_AUDIO:
global_flags.transcode_audio = false;
break;
+ case OPTION_DISABLE_AUDIO:
+ global_flags.transcode_audio = false;
+ global_flags.enable_audio = false;
+ break;
case OPTION_HTTP_X264_VIDEO:
global_flags.x264_video_to_http = true;
break;
case OPTION_FULLSCREEN:
global_flags.fullscreen = true;
break;
+ case OPTION_MJPEG_EXPORT_CARDS: {
+ if (card_to_mjpeg_stream_export_set) {
+ fprintf(stderr, "ERROR: --mjpeg-export-cards given twice\n");
+ exit(1);
+ }
+ global_flags.card_to_mjpeg_stream_export = parse_mjpeg_export_cards(optarg);
+ card_to_mjpeg_stream_export_set = true;
+ break;
+ }
case OPTION_HELP:
usage(program);
exit(0);
fprintf(stderr, "ERROR: --output-card points to a nonexistant card\n");
exit(1);
}
- if (!global_flags.transcode_audio && global_flags.stream_audio_codec_name.empty()) {
+ if (global_flags.enable_audio && !global_flags.transcode_audio && global_flags.stream_audio_codec_name.empty()) {
fprintf(stderr, "ERROR: If not transcoding audio, you must specify ahead-of-time what audio codec is in use\n");
fprintf(stderr, " (using --http-audio-codec).\n");
exit(1);
} else if (global_flags.x264_bitrate == -1) {
global_flags.x264_bitrate = DEFAULT_X264_OUTPUT_BIT_RATE;
}
+
+ if (!card_to_mjpeg_stream_export_set) {
+ // Fill in the default mapping (export all cards, in order).
+ for (unsigned card_idx = 0; card_idx < unsigned(global_flags.num_cards); ++card_idx) {
+ global_flags.card_to_mjpeg_stream_export[card_idx] = card_idx;
+ }
+ }
}
projects / nageru / blobdiff