X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=defs.h;h=05a38996747e05e3a4df6dfc05aa1ca31e03dee7;hb=21858063e28eed6218884df9ed82f5554b94957e;hp=cd1e267ddd071a0d97ad7fd54d36c5e4a42e638d;hpb=d8795d38bc8d11ddbbb10037b653f3748aea35a6;p=nageru

diff --git a/defs.h b/defs.h
index cd1e267..05a3899 100644
--- a/defs.h
+++ b/defs.h
@@ -11,7 +11,8 @@
 #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"
@@ -20,6 +21,9 @@
 	/* Make seekable .mov files. */ \
 	{ "movflags", "empty_moov+frag_keyframe+default_base_moof" }, \
 	\
+	/* 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 +32,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)