X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=21e17c988d7137b68b7b4c869fcffb077a3da3cf;hp=55968eed644763d7185be915eb5833cdf4eab03a;hb=58dd753c464d917dc446e2cbb4c01fd750d4eb87;hpb=a0fe013448d188b324c00383cfd91695d9d3d076

diff --git a/config.cpp b/config.cpp
index 55968ee..21e17c9 100644
--- a/config.cpp
+++ b/config.cpp
@@ -7,9 +7,9 @@
 #include <string.h>
 #include <net/if.h>
 #include <sys/socket.h>
-#include <map>
 #include <string>
 #include <utility>
+#include <unordered_map>
 #include <vector>
 
 #include "tlse.h"
@@ -26,7 +26,7 @@ using namespace std;
 struct ConfigLine {
 	string keyword;
 	vector<string> arguments;
-	map<string, string> parameters;
+	unordered_map<string, string> parameters;
 };
 
 namespace {
@@ -211,7 +211,7 @@ bool load_file_to_string(const string &filename, size_t max_size, string *conten
 	return true;
 }
 
-bool parse_tls_parameters(const map<string, string> &parameters, AcceptorConfig *acceptor)
+bool parse_tls_parameters(const unordered_map<string, string> &parameters, AcceptorConfig *acceptor)
 {
 	bool has_cert = false, has_key = false;
 
@@ -380,6 +380,54 @@ bool parse_stream(const ConfigLine &line, Config *config)
 		stream.pacing_rate = atoi(pacing_rate_it->second.c_str()) * 1024 / 8;
 	}
 
+	// Parse the HLS URL, if any.
+	const auto hls_url_it = line.parameters.find("hls_playlist");
+	if (hls_url_it != line.parameters.end()) {
+		stream.hls_url = hls_url_it->second;
+		if (stream.hls_url.empty()) {
+			log(ERROR, "Parameter 'hls_playlist' was given but empty");
+			return false;
+		}
+		if (stream.encoding == StreamConfig::STREAM_ENCODING_METACUBE) {
+			log(ERROR, "HLS cannot be used with Metacube output");
+			return false;
+		}
+	}
+
+	// Parse the HLS fragment duration, if any.
+	const auto hls_frag_duration_it = line.parameters.find("hls_frag_duration");
+	if (hls_frag_duration_it != line.parameters.end()) {
+		if (stream.hls_url.empty()) {
+			log(ERROR, "Parameter 'hls_frag_duration' given, but no 'hls_playlist' given");
+			return false;
+		}
+		stream.hls_frag_duration = stoi(hls_frag_duration_it->second);
+		if (stream.hls_frag_duration <= 0) {
+			log(ERROR, "'hls_frag_duration' must be a strictly positive integer");
+			return false;
+		}
+	}
+
+	// Parse the HLS backlog margin, if any.
+	const auto hls_backlog_margin_it = line.parameters.find("hls_backlog_margin");
+	if (hls_backlog_margin_it != line.parameters.end()) {
+		if (stream.hls_url.empty()) {
+			log(ERROR, "Parameter 'hls_backlog_margin' given, but no 'hls_playlist' given");
+			return false;
+		}
+		stream.hls_backlog_margin = stoi(hls_backlog_margin_it->second);
+		if (stream.hls_backlog_margin < 0 || stream.hls_backlog_margin >= stream.backlog_size) {
+			log(ERROR, "'hls_backlog_margin' must be nonnegative, but less than the backlog size");
+			return false;
+		}
+	}
+
+	// Parse the CORS origin, if it exists.
+	const auto allow_origin_it = line.parameters.find("allow_origin");
+	if (allow_origin_it != line.parameters.end()) {
+		stream.allow_origin = allow_origin_it->second;
+	}
+
 	config->streams.push_back(stream);
 	return true;
 }