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

diff --git a/config.h b/config.h
index 5a006ca..b5461cc 100644
--- a/config.h
+++ b/config.h
@@ -11,11 +11,19 @@
 
 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;
 	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 {
@@ -26,13 +34,15 @@ struct UDPStreamConfig {
 	int multicast_iface_index;  // Default is -1 (use operating system default).
 };
 
-struct PingConfig {
+struct Gen204Config {
 	std::string url;  // As seen by the client.
 	std::string allow_origin;  // Can be empty.
 };
 
 struct AcceptorConfig {
 	sockaddr_in6 addr;
+
+	std::string certificate_chain, private_key;  // In PEM format.
 };
 
 struct LogConfig {
@@ -45,7 +55,7 @@ struct Config {
 	int num_servers;
 	std::vector<StreamConfig> streams;
 	std::vector<UDPStreamConfig> udpstreams;
-	std::vector<PingConfig> pings;
+	std::vector<Gen204Config> pings;
 	std::vector<AcceptorConfig> acceptors;
 	std::vector<LogConfig> log_destinations;