X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=defs.h;h=55bb75e39a7a25052c3b2f408d5a8980a532846e;hb=b9feb66845bf24465b7671ac9ff7a52b88f6032b;hp=05a38996747e05e3a4df6dfc05aa1ca31e03dee7;hpb=e2efcadaaefd36c200accf5c72c6a9954a474602;p=nageru

diff --git a/defs.h b/defs.h
index 05a3899..55bb75e 100644
--- a/defs.h
+++ b/defs.h
@@ -1,11 +1,21 @@
 #ifndef _DEFS_H
 #define _DEFS_H
 
-#define OUTPUT_FREQUENCY 48000
+#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, 39, 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 WIDTH 1280
-#define HEIGHT 720
-#define MAX_CARDS 16
+#define FAKE_FPS 25  // Must be an integer.
+#define MAX_VIDEO_CARDS 16
+#define MAX_ALSA_CARDS 16
+#define MAX_BUSES 256  // Audio buses.
 
 // For deinterlacing. See also comments on InputState.
 #define FRAME_HISTORY_LENGTH 5
@@ -17,9 +27,10 @@
 #define LOCAL_DUMP_PREFIX "record-"
 #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. */ \
-	{ "movflags", "empty_moov+frag_keyframe+default_base_moof" }, \
+	/* 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" }, \