X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.h;h=a230731cee52b3a89566ec3f2df143439f258d97;hp=e2dcb43050674a9d3d6d54ab5b98cb310739a444;hb=6544fa0ec3f3a501bcb89ea977756911bd7f3ebd;hpb=0e96bbf9ee0fbebd5fe3fba4d186c0e0d73c9a32

diff --git a/config.h b/config.h
index e2dcb43..a230731 100644
--- a/config.h
+++ b/config.h
@@ -15,7 +15,9 @@ struct StreamConfig {
 	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;
 };
 
 struct UDPStreamConfig {
@@ -24,6 +26,12 @@ struct UDPStreamConfig {
 	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).
+	StreamConfig::Encoding src_encoding;
+};
+
+struct Gen204Config {
+	std::string url;  // As seen by the client.
+	std::string allow_origin;  // Can be empty.
 };
 
 struct AcceptorConfig {
@@ -40,6 +48,7 @@ struct Config {
 	int num_servers;
 	std::vector<StreamConfig> streams;
 	std::vector<UDPStreamConfig> udpstreams;
+	std::vector<Gen204Config> pings;
 	std::vector<AcceptorConfig> acceptors;
 	std::vector<LogConfig> log_destinations;