Release Nageru 1.3.3.

[nageru] / defs.h

diff --git a/defs.h b/defs.h
index 0e5378c4d07e5fbee67e888c1e5adab7ad88ae5c..498ade913215c23d61356135ca585deb16c3cd75 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -5,6 +5,7 @@
 #define MAX_FPS 60
 #define WIDTH 1280
 #define HEIGHT 720
+#define FAKE_FPS 25  // Must be an integer.
 #define MAX_CARDS 16
 
 // For deinterlacing. See also comments on InputState.
@@ -12,6 +13,7 @@
 
 #define AUDIO_OUTPUT_CODEC_NAME "pcm_s32le"
 #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 +22,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,10 +33,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)