Rename InputMapping::Input to InputMapping::Bus; it's less ambiguous.

[nageru] / defs.h

diff --git a/defs.h b/defs.h
index aa577bb607af039e8136c9e609e6e9027a872ea5..4ec3a91bce6df70018ea67035086a76c702a7fce 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -5,13 +5,16 @@
 #define MAX_FPS 60
 #define WIDTH 1280
 #define HEIGHT 720
+#define FAKE_FPS 25  // Must be an integer.
 #define MAX_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 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 +23,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" } \
 }