Add support for forced prebuffering.

[cubemap] / config.h

diff --git a/config.h b/config.h
index 8de6704ddd4e5e9c5292bca64b85740fa31faeeb..e2dcb43050674a9d3d6d54ab5b98cb310739a444 100644 (file)
--- a/config.h
+++ b/config.h
@@ -4,30 +4,30 @@
 // Various routines that deal with parsing the configuration file.
 
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <stddef.h>
 #include <string>
 #include <vector>
 
-struct MarkPoolConfig {
-       int from, to;
-};
-
 struct StreamConfig {
        std::string url;  // As seen by the client.
        std::string src;  // Can be empty.
        size_t backlog_size;
-       int mark_pool;  // -1 for none.
+       size_t prebuffering_bytes;
+       uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
        enum { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE } encoding;
 };
 
 struct UDPStreamConfig {
        sockaddr_in6 dst;
        std::string src;  // Can be empty.
-       int mark_pool;  // -1 for none.
+       uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
+       int ttl;  // Default is -1 (use operating system default).
+       int multicast_iface_index;  // Default is -1 (use operating system default).
 };
 
 struct AcceptorConfig {
-       int port;
+       sockaddr_in6 addr;
 };
 
 struct LogConfig {
@@ -38,7 +38,6 @@ struct LogConfig {
 struct Config {
        bool daemonize;
        int num_servers;
-       std::vector<MarkPoolConfig> mark_pools;
        std::vector<StreamConfig> streams;
        std::vector<UDPStreamConfig> udpstreams;
        std::vector<AcceptorConfig> acceptors;
@@ -47,6 +46,9 @@ struct Config {
        std::string stats_file;  // Empty means no stats file.
        int stats_interval;
 
+       std::string input_stats_file;  // Empty means no input stats file.
+       int input_stats_interval;
+
        std::string access_log_file;  // Empty means no accses_log file.
 };