Make it possible to siphon out a single MJPEG stream.

[nageru] / nageru / defs.h

diff --git a/nageru/defs.h b/nageru/defs.h
index 7b8cc696de1120de66ce04a1b2d29138089d024c..5113fda63a9acddcda45e816aeb287317e90c9b2 100644 (file)
--- a/nageru/defs.h
+++ b/nageru/defs.h
@@ -3,17 +3,9 @@
 
 #include <libavformat/version.h>
 
-// This flag is only supported in FFmpeg 3.3 and up, and we only require 3.1.
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 71, 100)
-#define MUX_SKIP_TRAILER "+skip_trailer"
-#else
-#define MUX_SKIP_TRAILER ""
-#endif
-
-#define OUTPUT_FREQUENCY 48000  // Currently needs to be exactly 48000, since bmusb outputs in that.
 #define MAX_FPS 60
 #define FAKE_FPS 25  // Must be an integer.
-#define MAX_VIDEO_CARDS 16
+// #define MAX_VIDEO_CARDS 16  // defined in shared_defs.h.
 #define MAX_ALSA_CARDS 16
 #define MAX_BUSES 256  // Audio buses.
 
@@ -28,22 +20,8 @@
 #define LOCAL_DUMP_SUFFIX ".nut"
 #define DEFAULT_STREAM_MUX_NAME "nut"  // Only for HTTP. Local dump guesses from LOCAL_DUMP_SUFFIX.
 #define DEFAULT_HTTPD_PORT 9095
-#define MUX_OPTS { \
-       /* Make seekable .mov files, and keep MP4 muxer from using unlimited amounts of memory. */ \
-       { "movflags", "empty_moov+frag_keyframe+default_base_moof" MUX_SKIP_TRAILER }, \
-       \
-       /* Make for somewhat less bursty stream output when using .mov. */ \
-       { "frag_duration", "125000" }, \
-       \
-       /* Keep nut muxer from using unlimited amounts of memory. */ \
-       { "write_index", "0" } \
-}
-
-// In bytes. Beware, if too small, stream clients will start dropping data.
-// For mov, you want this at 10MB or so (for the reason mentioned above),
-// but for nut, there's no flushing, so such a large mux buffer would cause
-// the output to be very uneven.
-#define MUX_BUFFER_SIZE 10485760
+
+#include "shared/shared_defs.h"
 
 // In number of frames. Comes in addition to any internal queues in x264
 // (frame threading, lookahead, etc.).