Deglobalify the rest of H264Encoder(Impl), so we can have multiple ones going.

[nageru] / defs.h

diff --git a/defs.h b/defs.h
index 9e3dfd581e72758985f08bff166c3ba24c5c1838..ef5aefd715179bebedcfacabcd2c6121a4d18600 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -1,12 +1,24 @@
 #ifndef _DEFS_H
 #define _DEFS_H
 
-// OUTPUT_FREQUENCY/FPS must be an integer for now.
 #define OUTPUT_FREQUENCY 48000
-#define FPS 60
+#define MAX_FPS 60
+#define WIDTH 1280
+#define HEIGHT 720
+#define MAX_CARDS 16
 
-#define AUDIO_OUTPUT_CODEC AV_CODEC_ID_MP3
-#define AUDIO_OUTPUT_SAMPLE_FMT AV_SAMPLE_FMT_FLTP
-#define AUDIO_OUTPUT_BIT_RATE 256000
+// 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" }}
+
+// In bytes. Beware, if too small, stream clients will start dropping data.
+#define MUX_BUFFER_SIZE 10485760
 
 #endif  // !defined(_DEFS_H)