Write 1.4.0 changelog.

[nageru] / defs.h

diff --git a/defs.h b/defs.h
index 7654f986bf142bf30c1e476be09c372fd1ade1b3..08708ad6dbf876404c5e969cc4c9ce37ea5037f7 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -1,17 +1,21 @@
 #ifndef _DEFS_H
 #define _DEFS_H
 
-#define OUTPUT_FREQUENCY 48000
+#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 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"