Fix a GCC warning.

[cubemap] / config.h

diff --git a/config.h b/config.h
index 3014b48d4128d4f4b1150a28a23ddc953b33d3ac..b5461cceae1f0978cce52d53a82de1b2cca95655 100644 (file)
--- a/config.h
+++ b/config.h
@@ -11,10 +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 {
@@ -25,8 +34,15 @@ struct UDPStreamConfig {
        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 {
        sockaddr_in6 addr;
+
+       std::string certificate_chain, private_key;  // In PEM format.
 };
 
 struct LogConfig {
@@ -39,6 +55,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;