X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fflags.cpp;fp=nageru%2Fflags.cpp;h=2a31422f854b723502a3680c536525a63da4dde8;hb=b36a6ab3fefcda233d90a79ee6f8f380b4ea765b;hp=bd807319c92fcb649073e2a5fe683686543a7f51;hpb=f34a3e1bbc207541842e0b54d5418d95bafc8e5b;p=nageru diff --git a/nageru/flags.cpp b/nageru/flags.cpp index bd80731..2a31422 100644 --- a/nageru/flags.cpp +++ b/nageru/flags.cpp @@ -163,7 +163,6 @@ void usage(Program program) fprintf(stderr, " --default-hdmi-input default to HDMI over SDI inputs for cards that have both\n"); fprintf(stderr, " --fake-cards-audio make fake (disconnected) cards output a simple tone\n"); fprintf(stderr, " --v4l-output DEVICE send video (no audio) to V4L2 output/loopback\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"); @@ -285,7 +284,6 @@ void parse_flags(Program program, int argc, char * const argv[]) { "default-hdmi-input", no_argument, 0, OPTION_DEFAULT_HDMI_INPUT }, { "fake-cards-audio", no_argument, 0, OPTION_FAKE_CARDS_AUDIO }, { "v4l-output", required_argument, 0, OPTION_V4L_OUTPUT }, - { "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 }, { "separate-x264-disk-encode", no_argument, 0, OPTION_SEPARATE_X264_DISK_ENCODE }, @@ -427,9 +425,6 @@ void parse_flags(Program program, int argc, char * const argv[]) case OPTION_V4L_OUTPUT: global_flags.v4l_output_device = optarg; break; - case OPTION_HTTP_UNCOMPRESSED_VIDEO: - global_flags.uncompressed_video_to_http = true; - break; case OPTION_HTTP_MUX: global_flags.stream_mux_name = optarg; break; @@ -697,10 +692,9 @@ void parse_flags(Program program, int argc, char * const argv[]) } } - if (global_flags.uncompressed_video_to_http + - global_flags.x264_video_to_http + + if (global_flags.x264_video_to_http + global_flags.av1_video_to_http > 1) { - fprintf(stderr, "ERROR: --http-{uncompressed,x264,av1}-video are mutually incompatible\n"); + fprintf(stderr, "ERROR: --http-{x264,av1}-video are mutually incompatible\n"); exit(1); } if (global_flags.bit_depth == 10) { @@ -709,7 +703,7 @@ void parse_flags(Program program, int argc, char * const argv[]) 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) { + if (global_flags.x264_video_to_disk && !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) {