Pull the file muxing out of the HTTPD. (It was pretty ugly all along.)

[nageru] / flags.cpp

diff --git a/flags.cpp b/flags.cpp
index 94c98bf00c4998278d212e70038dcdb4d6c9ce48..0c01e23799812a3a4f0060ac33d5bb98cbf12b55 100644 (file)
--- a/flags.cpp
+++ b/flags.cpp
@@ -16,7 +16,13 @@ void usage()
        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, "      --http-uncompressed-video   send uncompressed NV12 video to HTTP clients\n");
+       fprintf(stderr, "      --http-mux=NAME             mux to use for HTTP streams (default " DEFAULT_STREAM_MUX_NAME ")\n");
+       fprintf(stderr, "      --http-coarse-timebase      use less timebase for HTTP (recommended for muxers\n");
+       fprintf(stderr, "                                  that handle large pts poorly, like e.g. MP4)\n");
        fprintf(stderr, "      --flat-audio                start with most audio processing turned off\n");
+       fprintf(stderr, "      --no-flush-pbos             do not explicitly signal texture data uploads\n");
+       fprintf(stderr, "                                    (will give display corruption, but makes it\n");
+       fprintf(stderr, "                                    possible to run with apitrace in real time)\n");
 }
 
 void parse_flags(int argc, char * const argv[])
@@ -27,7 +33,10 @@ void parse_flags(int argc, char * const argv[])
                { "theme", required_argument, 0, 't' },
                { "va-display", required_argument, 0, 1000 },
                { "http-uncompressed-video", no_argument, 0, 1001 },
+               { "http-mux", required_argument, 0, 1004 },
+               { "http-coarse-timebase", no_argument, 0, 1005 },
                { "flat-audio", no_argument, 0, 1002 },
+               { "no-flush-pbos", no_argument, 0, 1003 },
                { 0, 0, 0, 0 }
        };
        for ( ;; ) {
@@ -50,9 +59,18 @@ void parse_flags(int argc, char * const argv[])
                case 1001:
                        global_flags.uncompressed_video_to_http = true;
                        break;
+               case 1004:
+                       global_flags.stream_mux_name = optarg;
+                       break;
+               case 1005:
+                       global_flags.stream_coarse_timebase = true;
+                       break;
                case 1002:
                        global_flags.flat_audio = true;
                        break;
+               case 1003:
+                       global_flags.flush_pbos = false;
+                       break;
                case 'h':
                        usage();
                        exit(0);