X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=f5182aac1512e9b8307ac57d16ada0b639260257;hp=cb16cbc33e06f7d1032d2b8d13f20379b20c262a;hb=ce0d42a14da5686366d0c73fa9b152e90619ff91;hpb=4ba4a9f0eac9777ef2d5071e980ae0d1ba22d048

diff --git a/config.cpp b/config.cpp
index cb16cbc..f5182aa 100644
--- a/config.cpp
+++ b/config.cpp
@@ -234,6 +234,14 @@ bool parse_stream(const ConfigLine &line, Config *config)
 		stream.mark_pool = allocate_mark_pool(from, to, config);
 	}
 
+	// Parse the pacing rate, converting from kilobits to bytes as needed.
+	map<string, string>::const_iterator pacing_rate_it = line.parameters.find("pacing_rate_kbit");
+	if (pacing_rate_it == line.parameters.end()) {
+		stream.pacing_rate = ~0U;
+	} else {
+		stream.pacing_rate = atoi(pacing_rate_it->second.c_str()) * 1024 / 8;
+	}
+
 	config->streams.push_back(stream);
 	return true;
 }
@@ -316,9 +324,18 @@ bool parse_udpstream(const ConfigLine &line, Config *config)
 		udpstream.mark_pool = allocate_mark_pool(from, to, config);
 	}
 
+	// Parse the pacing rate, converting from kilobits to bytes as needed.
+	map<string, string>::const_iterator pacing_rate_it = line.parameters.find("pacing_rate_kbit");
+	if (pacing_rate_it == line.parameters.end()) {
+		udpstream.pacing_rate = ~0U;
+	} else {
+		udpstream.pacing_rate = atoi(pacing_rate_it->second.c_str()) * 1024 / 8;
+	}
+
 	config->udpstreams.push_back(udpstream);
 	return true;
 }
+
 bool parse_error_log(const ConfigLine &line, Config *config)
 {
 	if (line.arguments.size() != 0) {