X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.h;h=b5461cceae1f0978cce52d53a82de1b2cca95655;hp=b84b957c10a6178c32088b69029e0042e229aa09;hb=6a647d84c4a76fba4f91fcb75ab8185dc7628d67;hpb=ce0d42a14da5686366d0c73fa9b152e90619ff91

diff --git a/config.h b/config.h
index b84b957..b5461cc 100644
--- a/config.h
+++ b/config.h
@@ -9,28 +9,40 @@
 #include <string>
 #include <vector>
 
-struct MarkPoolConfig {
-	int from, to;
-};
-
 struct StreamConfig {
 	std::string url;  // As seen by the client.
+	std::string hls_url;  // As seen by the client. Can be empty.
 	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;
+	enum Encoding { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE };
+	Encoding encoding;
+	Encoding src_encoding;
+	std::string allow_origin;
+
+	// These only matter if hls_url is nonempty.
+	int hls_frag_duration = 6;  // Apple recommendation (“HLS Authoring Specification for Apple Devices”, point 7.5).
+	size_t hls_backlog_margin = 0;
 };
 
 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 Gen204Config {
+	std::string url;  // As seen by the client.
+	std::string allow_origin;  // Can be empty.
 };
 
 struct AcceptorConfig {
-	int port;
+	sockaddr_in6 addr;
+
+	std::string certificate_chain, private_key;  // In PEM format.
 };
 
 struct LogConfig {
@@ -41,9 +53,9 @@ struct LogConfig {
 struct Config {
 	bool daemonize;
 	int num_servers;
-	std::vector<MarkPoolConfig> mark_pools;
 	std::vector<StreamConfig> streams;
 	std::vector<UDPStreamConfig> udpstreams;
+	std::vector<Gen204Config> pings;
 	std::vector<AcceptorConfig> acceptors;
 	std::vector<LogConfig> log_destinations;