X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=defs.h;h=7b8cc696de1120de66ce04a1b2d29138089d024c;hp=cd1e267ddd071a0d97ad7fd54d36c5e4a42e638d;hb=refs%2Fheads%2Fffmpeg-audio-only;hpb=d8795d38bc8d11ddbbb10037b653f3748aea35a6

diff --git a/defs.h b/defs.h
index cd1e267..7b8cc69 100644
--- a/defs.h
+++ b/defs.h
@@ -1,24 +1,39 @@
 #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, 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 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
 
 #define AUDIO_OUTPUT_CODEC_NAME "pcm_s32le"
-#define AUDIO_OUTPUT_BIT_RATE 0
+#define DEFAULT_AUDIO_OUTPUT_BIT_RATE 0
+#define DEFAULT_X264_OUTPUT_BIT_RATE 4500  // 5 Mbit after making room for some audio and TCP overhead.
 
 #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" }, \
 	\
 	/* Keep nut muxer from using unlimited amounts of memory. */ \
 	{ "write_index", "0" } \
@@ -28,6 +43,13 @@
 // 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 65536
+#define MUX_BUFFER_SIZE 10485760
+
+// In number of frames. Comes in addition to any internal queues in x264
+// (frame threading, lookahead, etc.).
+#define X264_QUEUE_LENGTH 50
+
+#define X264_DEFAULT_PRESET "ultrafast"
+#define X264_DEFAULT_TUNE "film"
 
 #endif  // !defined(_DEFS_H)