Make it possible to override stream mux on the command line.

[nageru] / defs.h

diff --git a/defs.h b/defs.h
index 9bed232f39db10a0c9d41b9ef2eab25daab5771c..33eef45419d89ad3a7e0e4bc5007c3384b82e4b3 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -5,16 +5,30 @@
 #define MAX_FPS 60
 #define WIDTH 1280
 #define HEIGHT 720
+#define MAX_CARDS 16
+
+// For deinterlacing. See also comments on InputState.
+#define FRAME_HISTORY_LENGTH 5
 
 #define AUDIO_OUTPUT_CODEC AV_CODEC_ID_PCM_S32LE
 #define AUDIO_OUTPUT_SAMPLE_FMT AV_SAMPLE_FMT_S32
 #define AUDIO_OUTPUT_BIT_RATE 0
 
-#define LOCAL_DUMP_FILE_NAME "test.mov"
-#define STREAM_MUX_NAME "mov"
-#define MUX_OPTS {{ "movflags", "empty_moov+frag_keyframe+default_base_moof" }}
+#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 MUX_OPTS { \
+       /* Make seekable .mov files. */ \
+       { "movflags", "empty_moov+frag_keyframe+default_base_moof" }, \
+       \
+       /* Keep nut muxer from using unlimited amounts of memory. */ \
+       { "write_index", "0" } \
+}
 
 // In bytes. Beware, if too small, stream clients will start dropping data.
-#define MUX_BUFFER_SIZE 10485760
+// 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
 
 #endif  // !defined(_DEFS_H)